Merge lp:~mitya57/indicator-session/multiple-names-in-current-desktop into lp:indicator-session/15.04

[Dmitry Shachnev]

Support multiple desktop names in XDG_CURRENT_DESKTOP.

The Desktop Entry Specification says:

If $XDG_CURRENT_DESKTOP is set then it contains a colon-separated list of strings. In order, each string is considered.

In GNOME Flashback session, we currently have:

  dmitry@dmitry-HP-ProBook-6560b:~$ echo $XDG_CURRENT_DESKTOP
  GNOME-Flashback:Unity

… and we still want to use unity-control-center. This branch makes it work again for us.

[Alberts Muktupāvels (muktupavels)]

Sorry, looks like this is wrong too. We should not pass NULL to g_strsplit...

const gchar *current_desktop;

current_desktop = g_getenv("XDG_CURRENT_DESKTOP");
if (!current_desktop)
    current_desktop = "";

desktop_names = g_strsplit (current_desktop, ":", 0);
for (i = 0; desktop_names[i]; ++i)
  ...

[Dmitry Shachnev (mitya57)]

Should be better now.

[Alberts Muktupāvels (muktupavels)]

Replace second g_getenv with xdg_current_desktop.

review: Approve

[lp:~mitya57/indicator-session/multiple-names-in-current-desktop]

461. By Dmitry Shachnev on 2014-11-30

Support multiple names in XDG_CURRENT_DESKTOP.

[Dmitry Shachnev (mitya57)]

Done.

[Charles Kerr (charlesk)]

LGTM. Thanks for the patch!

review: Approve

=== modified file 'src/backend-dbus/actions.c'
--- src/backend-dbus/actions.c	2014-08-31 10:39:30 +0000
+++ src/backend-dbus/actions.c	2014-11-30 16:59:20 +0000
@@ -831,9 +831,25 @@
 have_unity_control_center (void)
 {
   gchar *path;
+  const gchar *xdg_current_desktop;
+  gchar **desktop_names;
   gboolean have_ucc;
-
-  if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") != 0)
+  gboolean is_unity;
+  int i;
+
+  is_unity = FALSE;
+  xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+  if (xdg_current_desktop != NULL) {
+    desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
+    for (i = 0; desktop_names[i]; ++i) {
+      if (!g_strcmp0 (desktop_names[i], "Unity")) {
+        is_unity = TRUE;
+      }
+    }
+    g_strfreev (desktop_names);
+  }
+
+  if (!is_unity)
     return FALSE;
 
   path = g_find_program_in_path ("unity-control-center");