[gedit/gnome-3-2] Sync settings on exit

[Paolo Borelli <pborelli src gnome org>]

commit 91beda81cb2a10aa2654b4164abab0410a0f26ef
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Jan 3 19:04:12 2012 +0100

    Sync settings on exit

 gedit/gedit.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/gedit/gedit.c b/gedit/gedit.c
index e4caec4..b210fbe 100644
--- a/gedit/gedit.c
+++ b/gedit/gedit.c
@@ -163,7 +163,6 @@ gedit_main (gboolean service)
 {
 	GeditPluginsEngine *engine;
 	GeditApp *app;
-	gboolean restored = FALSE;
 	const gchar *dir;
 	gchar *icon_dir;
 
@@ -185,19 +184,27 @@ gedit_main (gboolean service)
 	gedit_debug_message (DEBUG_APP, "Init session manager");
 	gedit_session_init ();
 
-	if (!service && gedit_session_is_restored ())
+	if (!service)
 	{
-		restored = gedit_session_load ();
-	}
+		gboolean restored = FALSE;
 
-	if (!service && !restored)
-	{
-		gedit_main_window ();
+		if (gedit_session_is_restored ())
+		{
+			restored = gedit_session_load ();
+		}
+
+		if (!restored)
+		{
+			gedit_main_window ();
+		}
 	}
 
 	gedit_debug_message (DEBUG_APP, "Start gtk-main");
 	gtk_main ();
 
+	/* Make sure settings are saved */
+	g_settings_sync ();
+
 	/* Cleanup */
 	g_object_unref (engine);
 	g_object_unref (app);