Merge lp:~victored/slingshot/app-launcher-dbus into lp:~elementary-pantheon/slingshot/trunk

[Victor Martinez]

Implement org.pantheon.desktop.AppLauncherService DBus service.

Currently, the API only exports the app's current state via a signal. I've based the implementation on the GtkWidget::visible property, emitting a signal whenever it changes. Clients of this service can know the current state of Slingshot by connecting a handler to the visibility_changed() signal. Wingpanel is supposed to be one of those clients. See the related implementation at lp:~victored/wingpanel/app-launcher-dbus

[lp:~victored/slingshot/app-launcher-dbus]

238. By Victor Martinez on 2012-07-14

Connect to "show" and "hide" signals instead of using notify for the "visible" property.

239. By Victor Martinez on 2012-07-18

Emit initial state as soon as the dbus service name registration succeeds

[Victor Martinez (victored)]

Hey guys, you've got a pending review here!

[Sergey "Shnatsel" Davidoff (shnatsel)]

I like the approach.
Note that it makes it impossible to run several instances of Slingshot; make sure claiming d-bus name is wrapped in try-catch or something, that it doesn't crash if the name is already claimed.

review: Approve

[Removed by request (removed2115751)]

Built and installed with lp:~victored/wingpanel/app-launcher-dbus, works great so far.

[Andrea Basso (voluntatefaber)]

I'd like to release Slingshot beta1 tomorrow and I was thinking about merging this later, so that we don't get any unexpected bug. Do you all agree or think this should make it for beta1 despite the risk of new bugs?

[Victor Martinez (victored)]

That sounds good to me Andrea. I'm pretty sure I've not introduced any major issue though.

[Andrea Basso (voluntatefaber)]

Victor, I know you probably haven't, but for example, we merged Ricotz's gmenu-3 branch more than a month ago, IIRC, and it all seemed alright. Only yesterday we found out it introduced a severe regression, for this reason I'd like to wait. I'll merge it as soon as Slingshot gets released and I have a bit of spare time (probably from Friday).

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-07-13 11:57:20 +0000
+++ CMakeLists.txt	2012-07-18 17:46:21 +0000
@@ -42,6 +42,7 @@
     src/Settings.vala
     src/Utils.vala
     src/Backend/AppSystem.vala
+    src/Backend/DBusService.vala
     src/Backend/App.vala
     src/Backend/RelevancyService.vala
     src/Widgets/AppEntry.vala

=== added file 'src/Backend/DBusService.vala'
--- src/Backend/DBusService.vala	1970-01-01 00:00:00 +0000
+++ src/Backend/DBusService.vala	2012-07-18 17:46:21 +0000
@@ -0,0 +1,72 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+//  
+//  Copyright (C) 2012 Slingshot Developers
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY 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/>.
+
+
+namespace Slingshot {
+
+    public class DBusService : Object {
+
+        [DBus (name = "org.pantheon.desktop.AppLauncherService")]
+        private class Service : Object {
+            public signal void visibility_changed (bool launcher_visible);
+            private Gtk.Widget? view = null;
+
+            public Service (Gtk.Widget view) {
+                this.view = view;
+                view.show.connect (on_view_visibility_change);
+                view.hide.connect (on_view_visibility_change);
+            }
+
+            internal void on_view_visibility_change () {
+                debug ("Visibility changed. Sending visible = %s over DBus", view.visible.to_string ());
+                this.visibility_changed (view.visible);
+            }
+        }
+
+        private Service? service = null;
+
+        public DBusService (SlingshotView view) {
+            // Own bus name
+            // try to register service name in session bus
+            Bus.own_name (BusType.SESSION,
+                          "org.pantheon.desktop.AppLauncherService",
+                          BusNameOwnerFlags.NONE,
+                          (conn) => { on_bus_aquired (conn, view); },
+                          name_acquired_handler,
+                          () => { critical ("Could not aquire service name"); });
+
+        }
+
+        private void on_bus_aquired (DBusConnection connection, SlingshotView view) {
+            try {
+                // start service and register it as dbus object
+                service = new Service (view);
+                connection.register_object ("/org/pantheon/desktop/AppLauncherService", service);
+            } catch (IOError e) {
+                critical ("Could not register service: %s", e.message);
+                return_if_reached ();
+            }
+        }
+
+        private void name_acquired_handler (DBusConnection connection, string name) {
+            message ("Service registration suceeded");
+            return_if_fail (service != null);
+            // Emit initial state
+            service.on_view_visibility_change ();
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Slingshot.vala'
--- src/Slingshot.vala	2012-06-24 10:18:48 +0000
+++ src/Slingshot.vala	2012-07-18 17:46:21 +0000
@@ -30,6 +30,7 @@
         public static Settings settings { get; private set; default = null; }
         //public static CssProvider style_provider { get; private set; default = null; }
         public static IconTheme icon_theme { get; set; default = null; }
+        private DBusService? dbus_service = null;
 
         construct {
 
@@ -82,10 +83,13 @@
         }
 
         protected override void activate () {
-
             if (get_windows () == null) {
                 view = new SlingshotView ();
                 view.set_application (this);
+
+                if (dbus_service == null)
+                    dbus_service = new DBusService (view);
+
                 if (!silent) {
                     //view.move_to_coords (0, 0);
                     view.show_slingshot ();