Merge lp:~3v1n0/indicator-sound/launch-context into lp:indicator-sound/13.10

[Marco Trevisan (Treviño)]

MenuItem: use GtkLaunchContext with proper event timeout to launch applications

Also discards non-activation events

Like all the launcher applications, also indicator-sound should properly use the GAppLaunchContext when launching an application. Changed the code to use the event timestamp of the click action with the GtkAppLaunchContext.

This will allow to make indicator-sound to work nicely with the compiz focus prevention mechanism.

In handle_event calls we also need to ignore the non-activation events.

Upstream port of lp:~3v1n0/indicator-sound/launch-context/+merge/156918

[Lars Karlitski (larsu)]

Approved, same as the one merged in 13.04.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-raring-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-raring-armhf-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-sound-ci/17/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-07-12 20:07:48 +0000
+++ src/Makefile.am	2013-04-05 13:37:41 +0000
@@ -81,6 +81,7 @@
   --pkg config \
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
+  --pkg gdk-3.0 \
   --pkg gdk-pixbuf-2.0 \
   --pkg libxml-2.0
 
 
=== modified file 'src/metadata-menu-item.vala'
--- src/metadata-menu-item.vala	2012-03-16 17:30:21 +0000
+++ src/metadata-menu-item.vala	2013-04-05 13:37:41 +0000
@@ -168,13 +168,16 @@
   public override void handle_event (string name,
                                      Variant input_value,
                                      uint timestamp)
-  {   
+  {
+    if (name != Dbusmenu.MENUITEM_EVENT_ACTIVATED)
+      return;
+
     if(this.owner.current_state == PlayerController.state.OFFLINE)
     {
-      this.owner.instantiate();
+      this.owner.instantiate(timestamp);
     }
     else if(this.owner.current_state == PlayerController.state.CONNECTED){
-      this.owner.mpris_bridge.expose();
+      this.owner.mpris_bridge.expose(timestamp);
     }
   }
   
 
=== modified file 'src/mpris2-controller.vala'
--- src/mpris2-controller.vala	2012-03-21 09:47:53 +0000
+++ src/mpris2-controller.vala	2013-04-05 13:37:41 +0000
@@ -208,7 +208,7 @@
     return (this.player != null && this.mpris2_root != null);
   }
 
-  public void expose()
+  public void expose(uint timestamp)
   {
     if(this.connected() == true){
       this.mpris2_root.Raise.begin();
 
=== modified file 'src/player-controller.vala'
--- src/player-controller.vala	2012-06-21 16:45:16 +0000
+++ src/player-controller.vala	2013-04-05 13:37:41 +0000
@@ -98,11 +98,14 @@
    There is a need to wait before the application is on DBus before attempting to access its mpris address
    Hence only when the it has registered with us via libindicate do we attempt to kick off mpris communication
    */
-  public void instantiate()
+  public void instantiate(uint timestamp)
   {
     debug("instantiate in player controller for %s", this.app_info.get_name() );
+
     try{
-      this.app_info.launch(null, null);
+      var context = Gdk.Display.get_default().get_app_launch_context();
+      context.set_timestamp(timestamp);
+      this.app_info.launch(null, context);
       this.update_state(state.INSTANTIATING);
     }
     catch(GLib.Error error){
 
=== modified file 'src/sound-service.c'
--- src/sound-service.c	2011-08-10 12:51:49 +0000
+++ src/sound-service.c	2013-04-05 13:37:41 +0000
@@ -88,7 +88,7 @@
 {
   gboolean greeter_mode;
   
-  g_type_init();
+  gdk_init(&argc, &argv); 
   textdomain (GETTEXT_PACKAGE);
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   setlocale (LC_ALL, "");
 
=== modified file 'src/transport-menu-item.vala'
--- src/transport-menu-item.vala	2012-03-16 17:30:21 +0000
+++ src/transport-menu-item.vala	2013-04-05 13:37:41 +0000
@@ -70,6 +70,9 @@
                                     Variant input_value,
                                     uint timestamp)
   {
+    if (name != Dbusmenu.MENUITEM_EVENT_ACTIVATED)
+      return;
+
     Variant v = input_value;
     if ( input_value.is_of_type (VariantType.VARIANT)){
       v = input_value.get_variant();
@@ -82,7 +85,7 @@
     }
     else{
       this.cached_action = (Transport.Action)input;
-      this.owner.instantiate();
+      this.owner.instantiate(timestamp);
       this.property_set_int (MENUITEM_PLAY_STATE, (int)Transport.State.LAUNCHING);
     }
   }