eog r4712 - in trunk: . src

[csaavedra svn gnome org]

Author: csaavedra
Date: Sun Aug 31 18:11:24 2008
New Revision: 4712
URL: http://svn.gnome.org/viewvc/eog?rev=4712&view=rev

Log:
2008-08-31  Claudio Saavedra  <csaavedra igalia com>

	* src/eog-window.c: (update_ui_visibility): Use sensible defaults
	for the toolbar and the statusbar if these can't be obtained from
	GConf.



Modified:
   trunk/ChangeLog
   trunk/src/eog-window.c

Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c	(original)
+++ trunk/src/eog-window.c	Sun Aug 31 18:11:24 2008
@@ -1982,6 +1982,7 @@
 	
 	GtkAction *action;
 	GtkWidget *menubar;
+	GError *error = NULL;
 	
 	gboolean fullscreen_mode, visible;
 
@@ -1997,15 +1998,25 @@
 	menubar = gtk_ui_manager_get_widget (priv->ui_mgr, "/MainMenu");
 	g_assert (GTK_IS_WIDGET (menubar));
 
-	visible = gconf_client_get_bool (priv->client, EOG_CONF_UI_TOOLBAR, NULL);
+	visible = gconf_client_get_bool (priv->client, EOG_CONF_UI_TOOLBAR, &error);
 	visible = visible && !fullscreen_mode;
+	if (error) {
+		g_error_free (error);
+		error = NULL;
+		visible = !fullscreen_mode;
+	}
 	action = gtk_ui_manager_get_action (priv->ui_mgr, "/MainMenu/View/ToolbarToggle");
 	g_assert (action != NULL);
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
 	g_object_set (G_OBJECT (priv->toolbar), "visible", visible, NULL);
 
-	visible = gconf_client_get_bool (priv->client, EOG_CONF_UI_STATUSBAR, NULL);
+	visible = gconf_client_get_bool (priv->client, EOG_CONF_UI_STATUSBAR, &error);
 	visible = visible && !fullscreen_mode;
+	if (error) {
+		g_error_free (error);
+		error = NULL;
+		visible = !fullscreen_mode;
+	}
 	action = gtk_ui_manager_get_action (priv->ui_mgr, "/MainMenu/View/StatusbarToggle");
 	g_assert (action != NULL);
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);