gnome-session r4693 - in trunk: . gnome-session

[lucasr svn gnome org]

Author: lucasr
Date: Fri May 16 23:00:00 2008
New Revision: 4693
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4693&view=rev

Log:
2008-05-17  Lucas Rocha  <lucasr gnome org>

	* gnome-session/main.c
	(main): call gsm_dbus_shutdown, gsm_xsmp_shutdown, and
	gsm_gconf_shutdown after main quit.
	(gsm_initialization_error): call gtk_main_quit after showing error
	dialog.


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 May 16 23:00:00 2008
@@ -82,9 +82,7 @@
 
   gtk_widget_destroy (dialog);
 
-  /* Blah blah blah etc FIXME */
-
-  /* FIXME: shutdown gconf, dbus, etc? */
+  gtk_main_quit ();
 }
 
 int
@@ -139,7 +137,10 @@
   gsm_session_start (global_session);
 
   gtk_main ();
-  //gsm_session_free (session);
+
+  gsm_xsmp_shutdown ();
+  gsm_gconf_shutdown ();
+  gsm_dbus_shutdown ();
 
   return 0;
 }