[Pioneers-commits] r10 - in trunk/client/gtk: . data

[kemm at garage.maemo.org]

Author: kemm
Date: 2008-02-17 23:57:01 +0200 (Sun, 17 Feb 2008)
New Revision: 10

Modified:
   trunk/client/gtk/data/Makefile.am
   trunk/client/gtk/gui.c
Log:
Save fullscreen status

Modified: trunk/client/gtk/data/Makefile.am
===================================================================
--- trunk/client/gtk/data/Makefile.am	2008-02-17 21:42:39 UTC (rev 9)
+++ trunk/client/gtk/data/Makefile.am	2008-02-17 21:57:01 UTC (rev 10)
@@ -53,7 +53,7 @@
 
 desktop_DATA += client/gtk/data/pioneers.desktop
 
-dbus_DATA += client/gtk/data/com.nokia.pioneers.service
+dbus_DATA += client/gtk/data/pioneers.service
 
 EXTRA_DIST += client/gtk/data/splash.svg
 MAINTAINERCLEANFILES += client/gtk/data/splash.png

Modified: trunk/client/gtk/gui.c
===================================================================
--- trunk/client/gtk/gui.c	2008-02-17 21:42:39 UTC (rev 9)
+++ trunk/client/gtk/gui.c	2008-02-17 21:57:01 UTC (rev 10)
@@ -1136,12 +1136,8 @@
 /** Set the visibility of the toolbar */
 static void gui_set_toolbar_visible(void)
 {
-	GSList *list;
 	gboolean visible;
 
-	list = gtk_ui_manager_get_toplevels(ui_manager,
-					    GTK_UI_MANAGER_TOOLBAR);
-	g_assert(g_slist_length(list) == 1);
 	visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION
 					       (gtk_ui_manager_get_action
 						(ui_manager,
@@ -1154,7 +1150,6 @@
 		gtk_widget_hide(toolbar);
     }
 	config_set_int("settings/show_toolbar", visible);
-	g_slist_free(list);
 }
 
 /** Toggle fullscreen */
@@ -1172,6 +1167,8 @@
     } else {
         gtk_window_unfullscreen(GTK_WINDOW(app_window));
     }
+
+    config_set_int("settings/fullscreen", visible);
 }
 
 /** Show the accelerators in the toolbar */
@@ -1554,6 +1551,11 @@
 				       "ui/MainMenu/SettingsMenu/ShowHideToolbar")),
 				     config_get_int_with_default
 				     ("settings/show_toolbar", TRUE));
+    gtk_toggle_action_set_active(GTK_TOGGLE_ACTION
+                                 (gtk_ui_manager_get_action
+                                  (ui_manager,
+                                   "ui/MainMenu/SettingsMenu/Fullscreen")),
+                                 config_get_int_with_default("settings/fullscreen", FALSE));
 
 	g_signal_connect(G_OBJECT(app_window), "key_press_event",
 			 G_CALLBACK(hotkeys_handler), NULL);