Merge lp:~eric-koegel/lightdm/ck2-xdg-runtime-dir into lp:lightdm

[Eric Koegel]

ConsoleKit2 recently added support for managing the XDG_RUNTIME_DIR (in git master but not as a release yet), this patch allows lighdm to get the runtime dir from CK2 and export it for the user.

[Robert Ancell (robert-ancell)]

Thanks Eric!

There should be a test for this feature, but I'm happy to add that for you.

It may also be inappropriate to use g_warning when failing to get the directory, as older ConsolKits don't do this. But we can change that if anyone complains.

review: Approve

[Robert Ancell (robert-ancell)]

See revision 2274 for tests that were added for this.

=== modified file 'src/console-kit.c'
--- src/console-kit.c	2014-11-21 07:45:05 +0000
+++ src/console-kit.c	2016-01-26 01:28:04 +0000
@@ -260,3 +260,53 @@
     if (!is_closed)
         g_warning ("ConsoleKit.Manager.CloseSession() returned false");
 }
+
+gchar *
+ck_get_xdg_runtime_dir (const gchar *cookie)
+{
+    GDBusConnection *bus;
+    gchar *session_path;
+    gchar *runtime_dir = NULL;
+    GError *error = NULL;
+
+    g_return_if_fail (cookie != NULL);
+
+    g_debug ("Getting XDG_RUNTIME_DIR from ConsoleKit for session %s", cookie);
+
+    bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+    if (error)
+        g_warning ("Failed to get system bus: %s", error->message);
+    g_clear_error (&error);
+    if (!bus)
+        return NULL;
+
+    session_path = get_ck_session (bus, cookie);
+    if (session_path)
+    {
+        GVariant *result;
+
+        result = g_dbus_connection_call_sync (bus,
+                                              "org.freedesktop.ConsoleKit",
+                                              session_path,
+                                              "org.freedesktop.ConsoleKit.Session",
+                                              "GetXDGRuntimeDir",
+                                              g_variant_new ("()"),
+                                              G_VARIANT_TYPE ("(s)"),
+                                              G_DBUS_CALL_FLAGS_NONE,
+                                              -1,
+                                              NULL,
+                                              &error);
+        if (error)
+            g_warning ("Error getting XDG_RUNTIME_DIR from ConsoleKit: %s", error->message);
+        g_clear_error (&error);
+        if (!result)
+            return NULL;
+
+        g_variant_get (result, "(s)", &runtime_dir);
+        g_variant_unref (result);
+        g_debug ("ConsoleKit XDG_RUNTIME_DIR is %s", runtime_dir);
+    }
+
+    g_object_unref (bus);
+    return runtime_dir;
+}

=== modified file 'src/console-kit.h'
--- src/console-kit.h	2014-11-21 07:45:05 +0000
+++ src/console-kit.h	2016-01-26 01:28:04 +0000
@@ -26,6 +26,8 @@
 
 void ck_close_session (const gchar *cookie);
 
+gchar *ck_get_xdg_runtime_dir (const gchar *cookie);
+
 G_END_DECLS
 
 #endif /* CONSOLE_KIT_H_ */

=== modified file 'src/session-child.c'
--- src/session-child.c	2015-11-02 03:27:55 +0000
+++ src/session-child.c	2016-01-26 01:28:04 +0000
@@ -621,9 +621,20 @@
         if (console_kit_cookie)
         {
             gchar *value;
+            gchar *runtime_dir;
             value = g_strdup_printf ("XDG_SESSION_COOKIE=%s", console_kit_cookie);
             pam_putenv (pam_handle, value);
             g_free (value);
+
+            runtime_dir = ck_get_xdg_runtime_dir (console_kit_cookie);
+            if (runtime_dir)
+            {
+                gchar *value;
+                value = g_strdup_printf ("XDG_RUNTIME_DIR=%s", runtime_dir);
+                pam_putenv (pam_handle, value);
+                g_free (value);
+                g_free (runtime_dir);
+            }
         }
     }