gnome-session r5385 - in trunk: . gnome-session

[vuntz svn gnome org]

Author: vuntz
Date: Fri Apr 10 14:15:15 2009
New Revision: 5385
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5385&view=rev

Log:
2009-04-10  Vincent Untz  <vuntz gnome org>

	* gnome-session/main.c: (require_dbus_session): when relaunching with
	dbus-launch, correctly copy arguments that were passed to
	gnome-session over to the new call
	Fix bug #574310.


Modified:
   trunk/ChangeLog
   trunk/gnome-session/main.c

Modified: trunk/gnome-session/main.c
==============================================================================
--- trunk/gnome-session/main.c	(original)
+++ trunk/gnome-session/main.c	Fri Apr 10 14:15:15 2009
@@ -399,12 +399,12 @@
 
         /* +2 for our new arguments, +1 for NULL */
         new_argv = g_malloc (argc + 3 * sizeof (*argv));
-        
+
         new_argv[0] = "dbus-launch";
         new_argv[1] = "--exit-with-session";
-        new_argv[2] = argv[0];
-        for (i = 1; i < argc - 1; i++)
+        for (i = 0; i < argc; i++) {
                 new_argv[i + 2] = argv[i];
+	}
         new_argv[i + 2] = NULL;
         
         if (!execvp ("dbus-launch", new_argv)) {