Merge lp:~roryj/slingshot/add_to_plank into lp:~elementary-pantheon/slingshot/trunk

[Rory]

appentry: Add 'Add to/Remove from Dock' menuitem using Plank DBusManager

Add 'Add to/Remove from Dock' menuitem using plank dbus api.

[Rico Tzschichholz (ricotz)]

Merged the plank branch. So the required version is 0.8.1.1197

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-17 23:56:32 +0000
+++ CMakeLists.txt	2015-03-26 22:27:53 +0000
@@ -54,10 +54,17 @@
   message ("-- Zeitgeist integration disabled")
 endif ()
 
-set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;libsoup-2.4;gee-0.8;libgnome-menu-3.0;json-glib-1.0;${UNITY_DEPS};")
+find_package (PkgConfig)
+ 
+pkg_check_modules(PLANK QUIET plank>=0.8.1.1197)
+if (PLANK_FOUND)
+  set (PLANK_DEPS plank)
+  set (PLANK_OPTIONS --define=HAS_PLANK)
+endif ()
+
+set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;libsoup-2.4;gee-0.8;libgnome-menu-3.0;json-glib-1.0;${UNITY_DEPS};${PLANK_DEPS};")
 set (UI_DEPS "gtk+-3.0>=3.10.0;granite;${ZEITGEIST_DEPS};")
 
-find_package (PkgConfig)
 pkg_check_modules (DEPS REQUIRED "${CORE_DEPS}${UI_DEPS}" gthread-2.0)
 
 find_package (Vala REQUIRED)
@@ -98,6 +105,7 @@
     -g
     ${UNITY_OPTIONS}
     ${ZEITGEIST_OPTIONS}
+    ${PLANK_OPTIONS}
 )
 
 include_directories(${CMAKE_BINARY_DIR}/lib/synapse-core)
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2015-02-16 22:09:02 +0000
+++ src/Widgets/AppEntry.vala	2015-03-26 22:27:53 +0000
@@ -35,6 +35,16 @@
 
     private Backend.App application;
 
+#if HAS_PLANK
+    static construct {
+        plank_client = Plank.DBus.Client.get_instance ();
+    }
+
+    private static Plank.DBus.Client plank_client;
+    private bool docked = false;
+    private string desktop_uri;
+#endif
+
     public AppEntry (Backend.App app) {
         Gtk.TargetEntry dnd = {"text/uri-list", 0, 0};
         Gtk.drag_source_set (this, Gdk.ModifierType.BUTTON1_MASK, {dnd},
@@ -42,6 +52,9 @@
 
         desktop_id = app.desktop_id;
         desktop_path = app.desktop_path;
+#if HAS_PLANK
+        desktop_uri = File.new_for_path (desktop_path).get_uri ();
+#endif
 
         application = app;
         app_name = app.name;
@@ -158,7 +171,44 @@
                 }
             });
         }
+
+#if HAS_PLANK
+        if (plank_client != null && plank_client.is_connected) {
+            if (menu.get_children ().length () > 0)
+                menu.add (new Gtk.SeparatorMenuItem ());
+
+            menu.add (get_plank_menuitem ());
+        }
+#endif
+
         menu.show_all ();
     }
 
+#if HAS_PLANK
+    private Gtk.MenuItem get_plank_menuitem () {
+        docked = (desktop_uri in plank_client.get_persistent_applications ());
+
+        var plank_menuitem = new Gtk.MenuItem ();
+        plank_menuitem.set_use_underline (true);
+
+        if (docked)
+            plank_menuitem.set_label (_("Remove from _Dock"));
+        else
+            plank_menuitem.set_label (_("Add to _Dock"));
+
+        plank_menuitem.activate.connect (plank_menuitem_activate);
+
+        return plank_menuitem;
+    }
+
+    private void plank_menuitem_activate () {
+        if (plank_client == null || !plank_client.is_connected)
+            return;
+
+        if (docked)
+            plank_client.remove_item (desktop_uri);
+        else
+            plank_client.add_item (desktop_uri);
+    }
+#endif
 }