# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: eric.koegel@gmail.com-20150824083520-2k7im5bbzlddcc5i
# target_branch: file:///home/eric/code/lightdm/upstream/
# testament_sha1: 31494f4b26142451a86866fcd1feb2efc8d62dec
# timestamp: 2015-08-24 11:41:17 +0300
# base_revision_id: launchpad_translations_on_behalf_of_lightdm-team-\
#   20150821051822-k4su424fx6han0d0
# 
# Begin patch
=== modified file 'src/console-kit.c'
--- src/console-kit.c	2014-11-21 07:45:05 +0000
+++ src/console-kit.c	2015-08-24 08:35:20 +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	2015-08-24 08:35:20 +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-03-18 22:36:10 +0000
+++ src/session-child.c	2015-08-24 08:35:20 +0000
@@ -579,9 +579,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);
+            }
         }
     }
 

# Begin bundle
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