Merge lp:~3v1n0/indicator-sound/gtk-application-player-activate into lp:indicator-sound/13.04

[Marco Trevisan (Treviño)]

PlayerController use GtkApplicationPlayer and activate it when we need to raise

GtkApplicationPlayer: add a class to handle the GtkApplication players
It allows to check if the given player implements the "org.gtk.Application" interface
and if it's the case, it Activate the application with the proper timestamp when
requested.

Add a GtkApplicationPlayer utility class used to check if a player application supports the "org.gtk.Application" dbus interface, and in case it sends the platform_data with activation timestamp to it when raising it.

This fixes bug #627195 for some applications such as Rhythmbox.
Unfortunately the proper fix would need to change the MPRIS interface. See https://bugs.launchpad.net/ayatana-design/+bug/627195/comments/26

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

As discussed on IRC, this is okay to go in for 13.04. Thanks for the fix!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-04-03 17:21:28 +0000
+++ src/Makefile.am	2013-04-03 17:21:28 +0000
@@ -67,7 +67,8 @@
 	settings-manager.vala \
 	playlists-menu-item.vala \
 	freedesktop-interfaces.vala \
-	fetch-file.vala  
+	fetch-file.vala \
+	gtk-application-player.vala
 
 music_bridge_VALAFLAGS = \
   --ccode \

=== added file 'src/gtk-application-player.vala'
--- src/gtk-application-player.vala	1970-01-01 00:00:00 +0000
+++ src/gtk-application-player.vala	2013-04-03 17:21:28 +0000
@@ -0,0 +1,123 @@
+/*
+Copyright 2013 Canonical Ltd.
+
+Authors:
+    Marco Trevisan <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+[DBus (name = "org.gtk.Application")]
+public interface DBusGtkApplication : Object {
+  public abstract void Activate(GLib.HashTable<string, Variant?> platform_data) throws IOError;
+}
+
+public class GtkApplicationPlayer : GLib.Object
+{
+  public PlayerController owner {get; construct;}
+
+  private bool gtk_application_searched = false;
+  private DBusGtkApplication gtk_application;
+
+  public GtkApplicationPlayer(PlayerController ctrl)
+  {
+    GLib.Object(owner: ctrl);
+  }
+
+  public void activate(uint timestamp)
+  {
+    this.setup_gtk_application();
+
+    if (this.gtk_application == null) {
+      return;
+    }
+
+    var context = Gdk.Display.get_default().get_app_launch_context();
+    context.set_timestamp(timestamp);
+
+    var data = new GLib.HashTable<string, Variant?>(str_hash, str_equal);
+    data["desktop-startup-id"] = context.get_startup_notify_id(this.owner.app_info, new GLib.List<GLib.File>());
+
+    try {
+    	this.gtk_application.Activate(data);
+    }
+    catch (IOError e) {}
+  }
+
+  private void setup_gtk_application()
+  {
+    if (owner.current_state != PlayerController.state.CONNECTED)
+      return;
+
+    if (this.gtk_application != null || this.gtk_application_searched)
+      return;
+
+    try {
+      var connection = Bus.get_sync(BusType.SESSION);
+      var name = this.owner.dbus_name;
+      string gtk_application_path;
+      this.find_iface_path(connection, name, "/", "org.gtk.Application", out gtk_application_path);
+      this.gtk_application_searched = true;
+
+      if (gtk_application_path != null) {
+        this.gtk_application = Bus.get_proxy_sync(BusType.SESSION, this.owner.dbus_name, gtk_application_path);
+      }
+    } catch (Error e) {
+      return;
+    }
+  }
+
+  private void find_iface_path(DBusConnection connection, string name, string path, string target_iface, out string found_path)
+  {
+  	found_path = null;
+    DBusNodeInfo node = null;
+
+    try {
+      unowned string xml_string;
+      var xml = connection.call_sync(name, path, "org.freedesktop.DBus.Introspectable", "Introspect", null, new VariantType("(s)"), DBusCallFlags.NONE, 1000);
+      xml.get("(&s)", out xml_string);
+      node = new DBusNodeInfo.for_xml(xml_string);
+    } catch (Error e) {
+      return;
+    }
+
+    if (node == null) {
+      return;
+    }
+
+    foreach (var iface in node.interfaces) {
+      if (iface.name == target_iface) {
+        found_path = path;
+        return;
+      }
+    }
+
+    bool is_root = (path == "/");
+
+    foreach (var subnode in node.nodes) {
+      string new_path = path;
+
+      if (!is_root) {
+        new_path += "/";
+      }
+
+      new_path += subnode.path;
+
+      find_iface_path(connection, name, new_path, target_iface, out found_path);
+
+      if (found_path != null) {
+        return;
+      }
+    }
+  }
+}
\ No newline at end of file

=== modified file 'src/metadata-menu-item.vala'
--- src/metadata-menu-item.vala	2013-04-03 17:21:28 +0000
+++ src/metadata-menu-item.vala	2013-04-03 17:21:28 +0000
@@ -176,7 +176,8 @@
     {
       this.owner.instantiate(timestamp);
     }
-    else if(this.owner.current_state == PlayerController.state.CONNECTED){
+    else if (this.owner.current_state == PlayerController.state.CONNECTED) {
+      this.owner.gtk_app_player.activate(timestamp);
       this.owner.mpris_bridge.expose(timestamp);
     }
   }

=== modified file 'src/mpris2-controller.vala'
--- src/mpris2-controller.vala	2013-04-03 17:21:28 +0000
+++ src/mpris2-controller.vala	2013-04-03 17:21:28 +0000
@@ -208,9 +208,9 @@
     return (this.player != null && this.mpris2_root != null);
   }
 
-  public void expose(uint timestamp)
+  public void expose(uint timestmap)
   {
-    if(this.connected() == true){
+    if (this.connected() == true) {
       this.mpris2_root.Raise.begin();
     }
   }

=== modified file 'src/player-controller.vala'
--- src/player-controller.vala	2013-04-03 17:21:28 +0000
+++ src/player-controller.vala	2013-04-03 17:21:28 +0000
@@ -45,6 +45,7 @@
   public string dbus_name { get; set;}
   public ArrayList<PlayerItem> custom_items;
   public Mpris2Controller mpris_bridge;
+  public GtkApplicationPlayer gtk_app_player;
   public AppInfo? app_info { get; set;}
   public int menu_offset { get; set;}
   public string icon_name { get; set; }
@@ -149,6 +150,7 @@
     debug ( " establish mpris connection - use playlists value = %s ",
             this.use_playlists.to_string() );
     this.mpris_bridge = new Mpris2Controller (this);
+    this.gtk_app_player = new GtkApplicationPlayer (this);
     this.determine_state ();
   }