[Pkg-xfce-commits] r2371 - in desktop/branches/svn-snapshots/xfce4-session/debian: . patches

corsac at alioth.debian.org corsac at alioth.debian.org
Mon Oct 13 16:56:55 UTC 2008


Author: corsac
Date: 2008-10-13 16:56:55 +0000 (Mon, 13 Oct 2008)
New Revision: 2371

Removed:
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/07_parallel-startup.patch
Modified:
   desktop/branches/svn-snapshots/xfce4-session/debian/changelog
   desktop/branches/svn-snapshots/xfce4-session/debian/control
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
Log:
* new upstream beta release
* debian/control:
  - update build-deps for tuco-tuco.
  - add build dep on libxfconf-0-dev, libglade2-dev.
* debian/patches:
  - 02_use-mice-as-default-engine dropped, Mice is the default splash engine.
  - 07_parallel-startup removed, included upstream.

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-10-13 16:56:47 UTC (rev 2370)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-10-13 16:56:55 UTC (rev 2371)
@@ -1,5 +1,6 @@
-xfce4-session (4.5.90-1) UNRELEASED; urgency=low
+xfce4-session (4.5.91-1) UNRELEASED; urgency=low
 
+  [ Xfce 4.6 Alpha “Pinkie”]
   * new upstream alpha release.
   * debian/control:
     - update build deps for Xfce 4.6 alpha.
@@ -12,8 +13,16 @@
   * debian/patches:
     - 06_rephrase-tips removed.
     - 07_parallel-startup added, taken from upstream r28005.
+  [ Xfce 4.6 Beta 1 “Tuco-Tuco”]
+  * new upstream beta release
+  * debian/control:
+    - update build-deps for tuco-tuco.
+    - add build dep on libxfconf-0-dev, libglade2-dev.
+  * debian/patches:
+    - 02_use-mice-as-default-engine dropped, Mice is the default splash engine.
+    - 07_parallel-startup removed, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 23 Sep 2008 23:30:05 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 13 Oct 2008 10:54:40 +0200
 
 xfce4-session (4.4.2-6) unstable; urgency=low
 

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/control	2008-10-13 16:56:47 UTC (rev 2370)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/control	2008-10-13 16:56:55 UTC (rev 2371)
@@ -3,7 +3,10 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, libxfce4util-dev (>= 4.5.90), libxfcegui4-dev (>= 4.5.90), libwnck-dev, x11-xserver-utils
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxml-parser-perl, chrpath,
+ quilt, fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, 
+ libxfce4util-dev (>= 4.5.91), libxfcegui4-dev (>= 4.5.91), libwnck-dev, 
+ x11-xserver-utils, libxfconf-0-dev (>= 4.5.91), libglade2-dev
 Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch	2008-10-13 16:56:47 UTC (rev 2370)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_use-mice-as-default-engine.patch	2008-10-13 16:56:55 UTC (rev 2371)
@@ -1,30 +0,0 @@
---- xfce4-session/xfce4-session/main.c.orig	2006-11-04 19:42:52.000000000 +0100
-+++ xfce4-session/xfce4-session/main.c	2006-12-18 10:52:41.000000000 +0100
-@@ -61,6 +61,7 @@
- #include <xfce4-session/xfsm-manager.h>
- #include <xfce4-session/xfsm-startup.h>
- 
-+#define DEFAULT_SPLASH_ENGINE "mice"
- 
- void
- setup_environment (void)
-@@ -134,7 +135,7 @@
-   gint n;
- 
-   xfce_rc_set_group (rc, "Splash Screen");
--  engine = xfce_rc_read_entry (rc, "Engine", NULL);
-+  engine = xfce_rc_read_entry (rc, "Engine", DEFAULT_SPLASH_ENGINE);
- 
-   splash_screen = xfsm_splash_screen_new (dpy, engine);  
-   xfsm_splash_screen_next (splash_screen, _("Loading desktop settings"));
---- xfce4-session/xfce4-session.rc.orig	2006-11-04 19:42:56.000000000 +0100
-+++ xfce4-session/xfce4-session.rc	2006-12-18 11:58:25.000000000 +0100
-@@ -44,8 +44,3 @@
- Client2_PerScreen=False
- Client3_Command=xfdesktop
- Client3_PerScreen=False
--
--
--# Default splash screen selection.
--[Splash Screen]
--Engine=mice

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/patches/07_parallel-startup.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/07_parallel-startup.patch	2008-10-13 16:56:47 UTC (rev 2370)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/07_parallel-startup.patch	2008-10-13 16:56:55 UTC (rev 2371)
@@ -1,564 +0,0 @@
-Index: trunk/xfce4-session/xfsm-properties.h
-===================================================================
---- trunk/xfce4-session/xfsm-properties.h	(revision 28004)
-+++ trunk/xfce4-session/xfsm-properties.h	(revision 28005)
-@@ -49,6 +49,8 @@
-   gchar **restart_command;
-   gint    restart_style_hint;
-   gchar  *user_id;
-+
-+  guint startup_timeout_id;
- };
- 
- 
-Index: trunk/xfce4-session/xfsm-startup.c
-===================================================================
---- trunk/xfce4-session/xfsm-startup.c	(revision 28004)
-+++ trunk/xfce4-session/xfsm-startup.c	(revision 28005)
-@@ -55,19 +55,21 @@
- #include <xfce4-session/xfsm-manager.h>
- #include <xfce4-session/xfsm-splash-screen.h>
- 
-+#include "xfsm-startup.h"
- 
- 
-+
- /*
-    Prototypes
-  */
--static gboolean xfsm_startup_continue_failsafe    (void);
--static gboolean xfsm_startup_continue_session     (const gchar *previous_id);
--static void     xfsm_startup_child_watch          (GPid         pid,
--                                                   gint         status,
--                                                   gpointer     user_data);
--static void     xfsm_startup_child_watch_destroy  (gpointer     user_data);
-+static void     xfsm_startup_failsafe                (void);
-+static gboolean xfsm_startup_session_next_prio_group (void);
-+static void     xfsm_startup_child_watch             (GPid         pid,
-+                                                      gint         status,
-+                                                      gpointer     user_data);
-+static void     xfsm_startup_child_watch_destroy     (gpointer     user_data);
-+static gboolean xfsm_startup_handle_failed_client    (gpointer     data);
- 
--
- void
- xfsm_startup_init (XfceRc *rc)
- {
-@@ -429,33 +431,31 @@
- }
- 
- 
--/* Returns TRUE if done, else FALSE */
--gboolean
--xfsm_startup_continue (const gchar *previous_id)
-+void
-+xfsm_startup_begin (void)
- {
--  gboolean startup_done = FALSE;
--
-   if (failsafe_mode)
--    startup_done = xfsm_startup_continue_failsafe ();
-+    {
-+      xfsm_startup_failsafe ();
-+      xfsm_startup_autostart ();
-+    }
-   else
--    startup_done = xfsm_startup_continue_session (previous_id);
--
--  /* perform Autostart */
--  if (startup_done)
--    xfsm_startup_autostart ();
--  
--  return startup_done;
-+    {
-+      xfsm_startup_session_continue ();
-+    }
- }
- 
- 
--static gboolean
--xfsm_startup_continue_failsafe (void)
--{  
--  FailsafeClient *fclient;
--  
--  fclient = (FailsafeClient *) g_list_nth_data (failsafe_clients, 0);
--  if (fclient != NULL)
-+static void
-+xfsm_startup_failsafe (void)
-+{
-+  GList *lp;
-+
-+  for (lp = failsafe_clients; lp; lp = lp->next)
-     {
-+      FailsafeClient *fclient = (FailsafeClient *) lp->data;
-+
-+      /* FIXME: splash */
-       /* let the user know whats going on */
-       if (G_LIKELY (splash_screen != NULL))
-         {
-@@ -466,89 +466,147 @@
-       /* start the application */
-       xfsm_start_application (fclient->command, NULL, fclient->screen,
-                               NULL, NULL, NULL);
--      failsafe_clients = g_list_remove (failsafe_clients, fclient);
-       g_strfreev (fclient->command);
-       g_free (fclient);
-+    }
- 
--      /* there are more to come */
-+  g_list_free (failsafe_clients);
-+  failsafe_clients = NULL;
-+}
-+
-+
-+static gboolean
-+xfsm_startup_session_client (XfsmProperties *properties)
-+{
-+  gchar **argv;
-+  gint    argc;
-+  GPid    pid;
-+  gint    n;
-+
-+  /* generate the argument vector for the application (expanding variables) */
-+  argc = g_strv_length (properties->restart_command);
-+  argv = g_new (gchar *, argc + 1);
-+  for (n = 0; n < argc; ++n)
-+    argv[n] = xfce_expand_variables (properties->restart_command[n], NULL);
-+  argv[n] = NULL;
-+
-+  /* fork a new process for the application */
-+#ifdef HAVE_VFORK
-+  pid = vfork ();
-+#else
-+  pid = fork ();
-+#endif
-+
-+  /* handle the child process */
-+  if (pid == 0)
-+    {
-+      /* execute the application here */
-+      execvp (argv[0], argv);
-+      _exit (127);
-+    }
-+
-+  /* cleanup */
-+  g_strfreev (argv);
-+
-+  /* check if we failed to fork */
-+  if (G_UNLIKELY (pid < 0))
-+    {
-+      /* tell the user that we failed to fork */
-+      perror ("Failed to fork new process");
-       return FALSE;
-     }
- 
-+  /* watch the child process */
-+  g_child_watch_add_full (G_PRIORITY_LOW, pid, xfsm_startup_child_watch, g_strdup (properties->client_id), xfsm_startup_child_watch_destroy);
-+  properties->startup_timeout_id = g_timeout_add (STARTUP_TIMEOUT,
-+                                                  xfsm_startup_handle_failed_client,
-+                                                  properties);
-   return TRUE;
- }
- 
- 
-+void
-+xfsm_startup_session_continue ()
-+{
-+  gboolean client_started = FALSE;
-+
-+  /* try to start some clients.  if we fail to start anything in the current
-+   * priority group, move right to the next one.  if we *did* start something,
-+   * the failed/registered handlers will take care of moving us on to the
-+   * next priority group */
-+  while (client_started == FALSE && pending_properties != NULL)
-+    client_started = xfsm_startup_session_next_prio_group ();
-+
-+  if (G_UNLIKELY (client_started == FALSE && pending_properties == NULL))
-+    {
-+      /* we failed to start anything, and we don't have anything else,
-+       * to start, so just move on to the autostart items and signal
-+       * the manager that we're finished */
-+      xfsm_startup_autostart ();
-+      xfsm_manager_signal_startup_done ();
-+    }
-+}
-+
-+
-+/* returns TRUE if we started anything, FALSE if we didn't */
- static gboolean
--xfsm_startup_continue_session (const gchar *previous_id)
-+xfsm_startup_session_next_prio_group (void)
- {
-   XfsmProperties *properties;
--  gchar         **argv;
--  gint            argc;
--  GPid            pid;
--  gint            n;
--  
--again:
--  properties = (XfsmProperties *) g_list_nth_data (pending_properties, 0);
--  if (properties != NULL)
-+  gint            cur_prio_group;
-+  gboolean        client_started = FALSE;
-+
-+  /* can this ever happen? */
-+  while (G_UNLIKELY (pending_properties && pending_properties->data == NULL))
-+    pending_properties = g_list_delete_link (pending_properties, pending_properties);
-+
-+  if (pending_properties == NULL)
-+    return FALSE;
-+
-+  /* determine prio group for this run */
-+  properties = (XfsmProperties *) pending_properties->data;
-+  cur_prio_group = properties->priority;
-+
-+  xfsm_verbose ("Starting apps in prio group %d\n", cur_prio_group);
-+
-+  while (pending_properties)
-     {
-+      XfsmProperties *properties = (XfsmProperties *) pending_properties->data;
-+
-+      if (G_UNLIKELY (properties == NULL))
-+        {
-+          pending_properties = g_list_delete_link (pending_properties, pending_properties);
-+          continue;
-+        }
-+
-+      /* quit if we've hit all the clients in the current prio group */
-+      if (properties->priority != cur_prio_group)
-+        break;
-+
-+      /* FIXME: splash */
-       if (G_LIKELY (splash_screen != NULL))
-         {
-           xfsm_splash_screen_next (splash_screen,
-                                    figure_app_name (properties->program));
-         }
- 
--      /* drop the properties from the pending list */
-+      /* it's not pending anymore... */
-       pending_properties = g_list_remove (pending_properties, properties);
- 
--      /* generate the argument vector for the application (expanding variables) */
--      argc = g_strv_length (properties->restart_command);
--      argv = g_new (gchar *, argc + 1);
--      for (n = 0; n < argc; ++n)
--        argv[n] = xfce_expand_variables (properties->restart_command[n], NULL);
--      argv[n] = NULL;
--
--      /* fork a new process for the application */
--#ifdef HAVE_VFORK
--      pid = vfork ();
--#else
--      pid = fork ();
--#endif
--
--      /* handle the child process */
--      if (pid == 0)
-+      if (G_LIKELY (xfsm_startup_session_client (properties)))
-         {
--          /* execute the application here */
--          execvp (argv[0], argv);
--          _exit (127);
-+          starting_properties = g_list_append (starting_properties, properties);
-+          client_started = TRUE;
-         }
--
--      /* check if we failed to fork */
--      if (G_UNLIKELY (pid < 0))
--        {
--          /* tell the user that we failed to fork */
--          perror ("Failed to fork new process");
--        }
-       else
-         {
--          /* watch the child process */
--          g_child_watch_add_full (G_PRIORITY_LOW, pid, xfsm_startup_child_watch, g_strdup (properties->client_id), xfsm_startup_child_watch_destroy);
-+          /* if starting the app failed, just ditch it */
-+          xfsm_manager_handle_failed_client (properties);
-+          xfsm_properties_free (properties);
-         }
--
--      /* cleanup */
--      g_strfreev (argv);
--
--      /* move the properties to the list of starting applications */
--      starting_properties = g_list_append (starting_properties, properties);
--
--      /* try with the next pending if fork() failed */
--      if (G_UNLIKELY (pid < 0))
--        goto again;
--
--      /* more to come... */
--      return FALSE;
-     }
- 
--  return TRUE;
-+  return client_started;
- }
- 
- 
-@@ -568,8 +626,14 @@
-       properties = (XfsmProperties *) lp->data;
-       if (strcmp (properties->client_id, client_id) == 0)
-         {
-+          if (properties->startup_timeout_id)
-+            {
-+              g_source_remove (properties->startup_timeout_id);
-+              properties->startup_timeout_id = 0;
-+            }
-+
-           /* continue startup, this client failed most probably */
--          xfsm_manager_startup_continue (NULL);
-+          xfsm_startup_handle_failed_client (properties);
-           break;
-         }
-     }
-@@ -584,5 +648,25 @@
- }
- 
- 
-+static gboolean
-+xfsm_startup_handle_failed_client (gpointer data)
-+{
-+  XfsmProperties *properties = (XfsmProperties *) data;
- 
-+  properties->startup_timeout_id = 0;
- 
-+  xfsm_manager_handle_failed_client (properties);
-+
-+  starting_properties = g_list_remove (starting_properties, properties);
-+  xfsm_properties_free (properties);
-+
-+  if (starting_properties == NULL)
-+    {
-+      /* everything has finished starting or failed; continue startup */
-+      xfsm_startup_session_continue ();
-+    }
-+
-+  return FALSE;
-+}
-+
-+
-Index: trunk/xfce4-session/xfsm-startup.h
-===================================================================
---- trunk/xfce4-session/xfsm-startup.h	(revision 28004)
-+++ trunk/xfce4-session/xfsm-startup.h	(revision 28005)
-@@ -26,7 +26,8 @@
- 
- void xfsm_startup_init (XfceRc *rc);
- void xfsm_startup_foreign (void);
--gboolean xfsm_startup_continue (const gchar *previous_id);
-+void xfsm_startup_begin (void);
-+void xfsm_startup_session_continue (void);
- 
- #endif /* !__XFSM_STARTUP_H__ */
- 
-Index: trunk/xfce4-session/xfsm-manager.c
-===================================================================
---- trunk/xfce4-session/xfsm-manager.c	(revision 28004)
-+++ trunk/xfce4-session/xfsm-manager.c	(revision 28005)
-@@ -71,8 +71,6 @@
-    Prototypes
-  */
- static gboolean   xfsm_manager_startup (void);
--static void       xfsm_manager_handle_failed (void);
--static gboolean   xfsm_manager_startup_timedout (gpointer user_data);
- static void       xfsm_manager_load_settings (XfceRc *rc);
- static gboolean   xfsm_manager_load_session (void);
- static GdkPixbuf *xfsm_manager_load_session_preview (const gchar *name);
-@@ -84,7 +82,6 @@
- static XfsmManagerState state = XFSM_MANAGER_STARTUP;
- static gboolean         session_chooser = FALSE;
- static guint            die_timeout_id = 0;
--static guint            startup_timeout_id = 0;
- 
- 
- static gboolean
-@@ -93,7 +90,7 @@
-   xfsm_startup_foreign ();
-   pending_properties = g_list_sort (pending_properties,
-                                     (GCompareFunc) xfsm_properties_compare);
--  xfsm_manager_startup_continue (NULL);
-+  xfsm_startup_begin ();
-   return FALSE;
- }
- 
-@@ -127,36 +124,27 @@
- }
- 
- 
--static void
--xfsm_manager_handle_failed (void)
-+void
-+xfsm_manager_handle_failed_client (XfsmProperties *properties)
- {
-   /* Handle apps that failed to start here */
--  XfsmProperties *properties;
--  GList          *lp;
- 
--  for (lp = starting_properties; lp != NULL; lp = lp->next)
-+  if (properties->discard_command != NULL)
-     {
--      properties = XFSM_PROPERTIES (lp->data);
-+      xfsm_verbose ("Client Id = %s failed to start, running discard "
-+                    "command now.\n\n", properties->client_id);
- 
--      if (properties->discard_command != NULL)
--        {
--          xfsm_verbose ("Client Id = %s failed to start, running discard "
--                        "command now.\n\n", properties->client_id);
--
--          g_spawn_sync (properties->current_directory,
--                        properties->discard_command,
--                        properties->environment,
--                        G_SPAWN_SEARCH_PATH,
--                        NULL, NULL,
--                        NULL, NULL,
--                        NULL, NULL);
--        }
--
--      xfsm_properties_free (properties);
-+      g_spawn_sync (properties->current_directory,
-+                    properties->discard_command,
-+                    properties->environment,
-+                    G_SPAWN_SEARCH_PATH,
-+                    NULL, NULL,
-+                    NULL, NULL,
-+                    NULL, NULL);
-     }
- 
--  g_list_free (starting_properties);
--  starting_properties = NULL;
-+  if (starting_properties == NULL)
-+    xfsm_startup_session_continue ();
- }
- 
- 
-@@ -437,71 +425,31 @@
- 
- 
- void
--xfsm_manager_startup_continue (const gchar *previous_id)
-+xfsm_manager_signal_startup_done (void)
- {
--  gboolean startup_done = FALSE;
-   gchar buffer[1024];
-   XfceRc *rc;
- 
--  xfsm_verbose ("Manager startup continues [Previous Id = %s]\n\n",
--                previous_id != NULL ? previous_id : "None");
-+  xfsm_verbose ("Manager finished startup, entering IDLE mode now\n\n");
-+  state = XFSM_MANAGER_IDLE;
- 
--  if (startup_timeout_id != 0)
-+  if (!failsafe_mode)
-     {
--      g_source_remove (startup_timeout_id);
--      startup_timeout_id = 0;
-+      /* restore active workspace, this has to be done after the
-+       * window manager is up, so we do it last.
-+       */
-+      g_snprintf (buffer, 1024, "Session: %s", session_name);
-+      rc = xfce_rc_simple_open (session_file, TRUE);
-+      xfce_rc_set_group (rc, buffer);
-+      xfsm_manager_restore_active_workspace (rc);
-+      xfce_rc_close (rc);
- 
--      /* work around broken clients */
--      if (state != XFSM_MANAGER_STARTUP)
--        return;
-+      /* start legacy applications now */
-+      xfsm_legacy_startup ();
-     }
--
--  startup_done = xfsm_startup_continue (previous_id);
--
--  if (startup_done)
--    {
--      xfsm_verbose ("Manager finished startup, entering IDLE mode now\n\n");
--      state = XFSM_MANAGER_IDLE;
--
--      if (!failsafe_mode)
--        {
--          /* handle apps that failed to start */
--          xfsm_manager_handle_failed ();
--
--          /* restore active workspace, this has to be done after the
--           * window manager is up, so we do it last.
--           */
--          g_snprintf (buffer, 1024, "Session: %s", session_name);
--          rc = xfce_rc_simple_open (session_file, TRUE);
--          xfce_rc_set_group (rc, buffer);
--          xfsm_manager_restore_active_workspace (rc);
--          xfce_rc_close (rc);
--
--          /* start legacy applications now */
--          xfsm_legacy_startup ();
--        }
--    }
--  else
--    {
--      startup_timeout_id = g_timeout_add (STARTUP_TIMEOUT,
--                                          xfsm_manager_startup_timedout,
--                                          NULL);
--    }
- }
- 
- 
--static gboolean
--xfsm_manager_startup_timedout (gpointer user_data)
--{
--  xfsm_verbose ("Manager startup timed out\n\n");
--
--  startup_timeout_id = 0; /* will be removed automagically once we return */
--  xfsm_manager_startup_continue (NULL);
--  
--  return FALSE;
--}
--
--
- gchar*
- xfsm_manager_generate_client_id (SmsConn sms_conn)
- {
-@@ -593,6 +541,12 @@
-             }
-         }
- 
-+      if (properties != NULL && properties->startup_timeout_id != 0)
-+        {
-+          g_source_remove (properties->startup_timeout_id);
-+          properties->startup_timeout_id = 0;
-+        }
-+
-       /* If previous_id is invalid, the SM will send a BadValue error message
-        * to the client and reverts to register state waiting for another
-        * RegisterClient message.
-@@ -632,7 +586,8 @@
-        * above, previous_id will be NULL here.
-        * See http://bugs.xfce.org/view_bug_page.php?f_id=212 for details.
-        */
--      xfsm_manager_startup_continue (previous_id);
-+      if (starting_properties == NULL)
-+        xfsm_startup_session_continue ();
-     }
- 
-   return TRUE;
-Index: trunk/xfce4-session/xfsm-manager.h
-===================================================================
---- trunk/xfce4-session/xfsm-manager.h	(revision 28004)
-+++ trunk/xfce4-session/xfsm-manager.h	(revision 28005)
-@@ -45,8 +45,12 @@
- 
- gboolean xfsm_manager_restart (void);
- 
--void xfsm_manager_startup_continue (const gchar *previous_id);
-+/* call when startup is finished */
-+void xfsm_manager_signal_startup_done (void);
- 
-+/* call for each client that fails */
-+void xfsm_manager_handle_failed_client (XfsmProperties *properties);
-+
- gchar* xfsm_manager_generate_client_id (SmsConn sms_conn) G_GNUC_PURE;
- 
- XfsmClient* xfsm_manager_new_client           (SmsConn      sms_conn,

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-10-13 16:56:47 UTC (rev 2370)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-10-13 16:56:55 UTC (rev 2371)
@@ -1,4 +1,2 @@
 01_correct_shadows.patch
-02_use-mice-as-default-engine.patch
 04_xfce4-session-logout-manpage-typo.patch
-07_parallel-startup.patch




More information about the Pkg-xfce-commits mailing list