gnome-session r4975 - in trunk: . splash

[fcrozat svn gnome org]

Author: fcrozat
Date: Tue Aug 19 17:17:41 2008
New Revision: 4975
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4975&view=rev

Log:
2008-08-19  Frederic Crozat  <fcrozat mandriva com>

        * splash/gnome-session-splash.c:
        Exit splash screen when last client startup
        notification finished. Fixes #546410



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

Modified: trunk/splash/gnome-session-splash.c
==============================================================================
--- trunk/splash/gnome-session-splash.c	(original)
+++ trunk/splash/gnome-session-splash.c	Tue Aug 19 17:17:41 2008
@@ -46,6 +46,8 @@
 #define GNOME_SESSION_DBUS_OBJECT    "/org/gnome/SessionManager"
 #define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
 
+static int splash_clients = 0;
+
 static DBusGConnection *
 get_session_bus (void)
 {
@@ -123,6 +125,7 @@
                 gsm_splash_window_start (splash,
                                          sn_startup_sequence_get_name (seq),
                                          sn_startup_sequence_get_icon_name (seq));
+                splash_clients++;
                 break;
 
         case SN_MONITOR_EVENT_COMPLETED:
@@ -135,6 +138,11 @@
 
                 gsm_splash_window_finish (splash,
                                           sn_startup_sequence_get_name (seq));
+                splash_clients--;
+                if (splash_clients <= 0) {
+                        gtk_main_quit ();
+                        return;
+                }
                 break;
 
         default: