Merge lp:~ricotz/slingshot/plank-0.11 into lp:~elementary-pantheon/slingshot/trunk

[Rico Tzschichholz]

This should be merged/pushed after plank 0.10.9 hit the daily PPA

[xapantu (xapantu)]

Why? What is the conditional build system for then?

review: Needs Information

[Rico Tzschichholz (ricotz)]

> Why? What is the conditional build system for then?

Just to avoid tampering with the recipe to force a rebuild. So this merge actually triggers the needed rebuild.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-20 05:36:12 +0000
+++ CMakeLists.txt	2015-11-03 15:37:46 +0000
@@ -56,10 +56,16 @@
 
 find_package (PkgConfig)
  
-pkg_check_modules(PLANK QUIET plank>=0.8.1.1197)
-if (PLANK_FOUND)
+pkg_check_modules(PLANK011 QUIET plank>=0.10.9)
+if (PLANK011_FOUND)
   set (PLANK_DEPS plank)
-  set (PLANK_OPTIONS --define=HAS_PLANK)
+  set (PLANK_OPTIONS --define=HAS_PLANK --define=HAS_PLANK_0_11)
+else ()
+  pkg_check_modules(PLANK QUIET plank>=0.9.0)
+  if (PLANK_FOUND)
+    set (PLANK_DEPS plank)
+    set (PLANK_OPTIONS --define=HAS_PLANK)
+  endif ()
 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};")
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2015-03-26 21:42:32 +0000
+++ src/Widgets/AppEntry.vala	2015-11-03 15:37:46 +0000
@@ -37,10 +37,18 @@
 
 #if HAS_PLANK
     static construct {
+#if HAS_PLANK_0_11
+        plank_client = Plank.DBusClient.get_instance ();
+#else
         plank_client = Plank.DBus.Client.get_instance ();
+#endif
     }
 
+#if HAS_PLANK_0_11
+    private static Plank.DBusClient plank_client;
+#else
     private static Plank.DBus.Client plank_client;
+#endif
     private bool docked = false;
     private string desktop_uri;
 #endif