Merge lp:~mitya57/indicator-datetime/lp1502480 into lp:indicator-datetime/15.10

[Dmitry Shachnev]

Support multiple desktop names in $XDG_CURRENT_DESKTOP.

According to the Desktop Entry specification:

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

This branch adds support for proper detecting of Unity-derived desktops. It is mainly needed for GNOME Flashback session, which uses unity-control-center and XDG_DESKTOP_NAME=GNOME-Flashback:Unity.

[Alberts Muktupāvels (muktupavels)]

review: Approve

[Mystic-Mirage (mystic-mirage)]

review: Approve

[Alkis Georgopoulos (alkisg)]

It looks fine to me.

In shell, to avoid the loop, I do:
if echo ":$XDG_CURRENT_DESKTOP:" | grep -q ":Unity:"; then
    echo yes
else
    echo no
fi

Performance-wise it's fine, it needs only one malloc (for strcat) instead of many (for split), but I'm not sure how readable it is.

review: Approve

[Sebastien Bacher (seb128)]

thanks

review: Approve

[Sebastien Bacher (seb128)]

it might be a bit nicer to move the is_unity in a function which is what is done usually...

[Charles Kerr (charlesk)]

+1 on seb128's to move it into a standalone is_unity() function.

Not a dealbreaker, but I'd probably cache the flag so that we don't have to re-evaluate it every time is_unity() is called.

[lp:~mitya57/indicator-datetime/lp1502480]

440. By Dmitry Shachnev on 2016-04-05

Support multiple desktop names in XDG_CURRENT_DESKTOP

[Dmitry Shachnev (mitya57)]

Added a standalone function and caching, please re-review.

[Charles Kerr (charlesk)]

LGTM. Thanks Dmitry :)

review: Approve

=== modified file 'include/datetime/actions-live.h'
--- include/datetime/actions-live.h	2016-03-21 17:32:39 +0000
+++ include/datetime/actions-live.h	2016-04-05 21:02:27 +0000
@@ -53,6 +53,7 @@
     void set_location(const std::string& zone, const std::string& name) override;
 
 protected:
+    static bool is_unity();
     virtual void execute_command(const std::string& command);
     virtual void dispatch_url(const std::string& url);
 };

=== modified file 'src/actions-live.cpp'
--- src/actions-live.cpp	2016-03-21 17:32:39 +0000
+++ src/actions-live.cpp	2016-04-05 21:02:27 +0000
@@ -61,13 +61,39 @@
 ****
 ***/
 
+bool LiveActions::is_unity()
+{
+    static bool cached = false;
+    static bool result;
+
+    if (cached) {
+        return result;
+    }
+
+    result = false;
+    const gchar *xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+
+    if (xdg_current_desktop != NULL) {
+        gchar **desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
+        for (size_t i = 0; desktop_names[i]; ++i) {
+            if (!g_strcmp0 (desktop_names[i], "Unity")) {
+                result = true;
+                break;
+            }
+        }
+        g_strfreev (desktop_names);
+    }
+    cached = true;
+    return result;
+}
+
 void LiveActions::desktop_open_settings_app()
 {
     if (g_getenv ("MIR_SOCKET") != nullptr)
     {
         dispatch_url("settings:///system/time-date");
     }
-    else if ((g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0))
+    else if (is_unity())
     {
         execute_command("unity-control-center datetime");
     }