gnome-session r5033 - in trunk: . compat

[vuntz svn gnome org]

Author: vuntz
Date: Mon Sep  1 23:27:57 2008
New Revision: 5033
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5033&view=rev

Log:
2008-09-02  Vincent Untz  <vuntz gnome org>

	* compat/gnome-keyring-daemon-wrapper.c: (keyring_daemon_start): call
	gnome_keyring_daemon_prepare_environment_sync() so that the keyring
	daemon has all the right environment variables.
	Patch by Stef Walter <stef memberwebs com>
	Fix part of bug #547272.


Modified:
   trunk/ChangeLog
   trunk/compat/gnome-keyring-daemon-wrapper.c

Modified: trunk/compat/gnome-keyring-daemon-wrapper.c
==============================================================================
--- trunk/compat/gnome-keyring-daemon-wrapper.c	(original)
+++ trunk/compat/gnome-keyring-daemon-wrapper.c	Mon Sep  1 23:27:57 2008
@@ -73,18 +73,13 @@
         char       *pid_str;
         char       *end;
         const char *old_keyring;
-        const char *display;
         char       *argv[2];
 
         /* If there is already a working keyring, don't start a new daemon */
         old_keyring = g_getenv ("GNOME_KEYRING_SOCKET");
         if (old_keyring != NULL &&
             access (old_keyring, R_OK | W_OK) == 0) {
-                display = g_getenv ("DISPLAY");
-                if (display != NULL) {
-                        gnome_keyring_daemon_set_display_sync (display);
-                }
-
+                gnome_keyring_daemon_prepare_environment_sync ();
                 return;
         }
 
@@ -149,6 +144,8 @@
                         }
 
                         g_strfreev (lines);
+
+                        gnome_keyring_daemon_prepare_environment_sync ();
                 } else {
                         /* daemon failed for some reason */
                         g_printerr ("gnome-keyring-daemon failed to start correctly, exit code: %d\n",