Merge lp:~mitya57/indicator-session/settings-daemon-schema into lp:indicator-session

[Dmitry Shachnev]

Use unity-settings-daemon GSettings schema only on Unity. On the other desktops, use gnome-settings-daemon schema.

This makes the behavior introduced in https://code.launchpad.net/~khurshid-alam/indicator-session/use-usd-schemas/+merge/372301 conditional on $XDG_CURRENT_DESKTOP value.

This fixes wrong keybinding for Lock that was shown on GNOME Flashback session. indicator-session showed Ctrl+Alt+L while it is really Super+L.

[Alberts Muktupāvels (muktupavels)]

review: Approve

[lp:~mitya57/indicator-session/settings-daemon-schema]

507. By Dmitry Shachnev on 2021-03-26

Use unity-settings-daemon GSettings schema only on Unity

On the other desktops, use gnome-settings-daemon schema.

508. By Dmitry Shachnev on 2021-03-26

Adapt for screensaver key changing to array of strings in g-s-d >= 3.33.0

https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/103

509. By Dmitry Shachnev on 2021-03-26

Move unity-settings-daemon-schemas from Depends to Recommends

Anyone who is using Unity will have this package installed anyway.

[Khurshid Alam (khurshid-alam)]

@Dmitry

Ok. This seems merged. But just wanted to point out unity remix people build unity-mini iso from netboot (and now cloud/core) image.

https://wiki.ubuntu.com/UbuntuUnityExperience/mimimal-unity-installation

For that unity-settings-daemon-schemas is needed to in depends no ?

[Khurshid Alam (khurshid-alam)]

review: Approve

[Dmitry Shachnev (mitya57)]

Hi Khurshid!

unity has a hard dependency on unity-settings-daemon-schemas. So if unity itself is installed, that package will be installed too:

https://git.launchpad.net/unity/tree/debian/control#n80

So I think there is no need to depend on it here.

=== modified file 'debian/control'
--- debian/control	2020-11-18 15:28:59 +0000
+++ debian/control	2021-03-26 20:30:38 +0000
@@ -31,7 +31,6 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libpam-systemd,
-         unity-settings-daemon-schemas,
          gnome-settings-daemon-common,
          gsettings-desktop-schemas,
          indicator-common,
@@ -39,6 +38,7 @@
             gnome-screensaver | mate-screensaver,
             yelp,
             unity-control-center | gnome-control-center | mate-control-center,
+            unity-settings-daemon-schemas,
 Suggests: lightdm,
           apport,
           zenity,

=== modified file 'src/service.c'
--- src/service.c	2019-09-05 07:30:39 +0000
+++ src/service.c	2021-03-26 20:30:38 +0000
@@ -716,9 +716,20 @@
     {
       if (want_accel)
         {
-          gchar * str = g_settings_get_string (p->keybinding_settings, "screensaver");
-          g_menu_item_set_attribute (item, "accel", "s", str);
-          g_free (str);
+          GVariant * value = g_settings_get_value (p->keybinding_settings, "screensaver");
+          if (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING_ARRAY))
+            {
+              const gchar ** strs = g_variant_get_strv (value, NULL);
+              if (strs)
+                g_menu_item_set_attribute (item, "accel", "s", strs[0]);
+              g_free (strs);
+            }
+          else
+            {
+              const gchar * str = g_variant_get_string (value, NULL);
+              g_menu_item_set_attribute (item, "accel", "s", str);
+            }
+          g_variant_unref (value);
         }
 
       g_menu_append_item (menu, item);
@@ -1280,6 +1291,33 @@
   g_signal_emit (self, signals[NAME_LOST], 0, NULL);
 }
 
+static gboolean
+desktop_is_unity (void)
+{
+  const gchar * xdg_current_desktop;
+  gchar ** desktop_names;
+  int i;
+
+  xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+
+  if (xdg_current_desktop == NULL)
+    return FALSE;
+
+  desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
+
+  for (i = 0; desktop_names[i]; ++i)
+    {
+      if (g_strcmp0 (desktop_names[i], "Unity") == 0)
+        {
+          g_strfreev (desktop_names);
+          return TRUE;
+        }
+    }
+
+  g_strfreev (desktop_names);
+  return FALSE;
+}
+
 /***
 ****
 ***/
@@ -1298,7 +1336,10 @@
                                    INDICATOR_TYPE_SESSION_SERVICE,
                                    IndicatorSessionServicePrivate);
   p->indicator_settings = g_settings_new ("com.canonical.indicator.session");
-  p->keybinding_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.media-keys");
+  if (desktop_is_unity ())
+    p->keybinding_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.media-keys");
+  else
+    p->keybinding_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");
 
   /* Only use unity8 schema if it's installed; this avoids a hard dependency
      on unity8-schemas */