[Pkg-xfce-commits] r2218 - in desktop/trunk/xfce4-session/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-08-20 07:24:36 +0000 (Wed, 20 Aug 2008)
New Revision: 2218

Added:
   desktop/trunk/xfce4-session/debian/patches/07_startup-speed.patch
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/patches/series
Log:
* debian/patches:
  - 07_startup-speed added, speed up startup by not waiting for forks().

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/trunk/xfce4-session/debian/changelog	2008-08-20 07:24:36 UTC (rev 2218)
@@ -1,3 +1,10 @@
+xfce4-session (4.4.2-7) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 07_startup-speed added, speed up startup by not waiting for forks().
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 20 Aug 2008 09:03:12 +0200
+
 xfce4-session (4.4.2-6) unstable; urgency=low
 
   * debian/{postinst,prerm}: have them back, they manage the x-session-manager

Added: desktop/trunk/xfce4-session/debian/patches/07_startup-speed.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/07_startup-speed.patch	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/patches/07_startup-speed.patch	2008-08-20 07:24:36 UTC (rev 2218)
@@ -0,0 +1,28 @@
+diff -purN xfce4-session-4.4.2/xfce4-session/xfsm-manager.c
+xfce4-session-4.4.2.new/xfce4-session/xfsm-manager.c
+--- xfce4-session-4.4.2/xfce4-session/xfsm-manager.c    2007-11-17 11:31:07.000000000 -0800
++++ xfce4-session-4.4.2.new/xfce4-session/xfsm-manager.c        2008-07-26 08:58:18.000000000 -0700
+@@ -454,7 +454,9 @@ xfsm_manager_startup_continue (const gch
+         return;
+     }
+
+-  startup_done = xfsm_startup_continue (previous_id);
++  startup_done = FALSE;
++  while (!startup_done)
++    startup_done = xfsm_startup_continue (previous_id);
+
+   if (startup_done)
+     {
+diff -purN xfce4-session-4.4.2/xfce4-session/xfsm-startup.c
+xfce4-session-4.4.2.new/xfce4-session/xfsm-startup.c
+--- xfce4-session-4.4.2/xfce4-session/xfsm-startup.c    2007-11-17 11:31:07.000000000 -0800
++++ xfce4-session-4.4.2.new/xfce4-session/xfsm-startup.c        2008-07-25 23:30:57.000000000 -0700
+@@ -374,7 +374,7 @@ xfsm_startup_autostart_xdg (void)
+           terminal = xfce_rc_read_bool_entry (rc, "Terminal", FALSE);
+
+           /* try to launch the command */
+-          if (!xfce_exec (exec, terminal, startup_notify, &error))
++          if (!xfce_exec (exec, terminal, 0, &error))
+             {
+               g_warning ("Unable to launch \"%s\" (specified by %s): %s", exec, files[n], error->message);
+               g_error_free (error);

Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/trunk/xfce4-session/debian/patches/series	2008-08-20 07:24:36 UTC (rev 2218)
@@ -3,3 +3,4 @@
 03_xfce4-session-manpage-typo.patch
 04_xfce4-session-logout-manpage-typo.patch
 05_fix-resize-simple-splash-engine.patch
+07_startup-speed.patch