Do not fail if prefs.js is corrupted.

2003-09-20  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/mozilla/mozilla-embed-single.cpp:

        Do not fail if prefs.js is corrupted.

        * src/ephy-window.c: (ephy_window_state_event_cb):

        Do not allow to edit toolbar in fs

3 files changed, 17 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index eab79e522..edcdfaa32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2003-09-20  Marco Pesenti Gritti  <marco@gnome.org>
 
+	* embed/mozilla/mozilla-embed-single.cpp:
+
+	Do not fail if prefs.js is corrupted.
+
+	* src/ephy-window.c: (ephy_window_state_event_cb):
+
+	Do not allow to edit toolbar in fs
+
+2003-09-20  Marco Pesenti Gritti  <marco@gnome.org>
+
 	* lib/egg/egg-editable-toolbar.c: (drag_data_get_cb),
 	(create_item):
 
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 9188a4dfb..b4f5fc2f8 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -346,7 +346,6 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes)
         if (NS_FAILED(rv))
         {
                 g_warning ("failed to read user preferences, error: %x", rv);
-		return FALSE;
         }
 
         nsCOMPtr<nsIPrefBranch> pref;
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 1c6ebf531..367c91e73 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -552,6 +552,7 @@ ephy_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EphyW
 {
 	if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
 	{
+		GtkActionGroup *action_group;
 		GtkAction *action;
 		gboolean fullscreen;
 
@@ -566,9 +567,13 @@ ephy_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EphyW
 			ephy_window_unfullscreen (window);
 		}
 
-		action = gtk_action_group_get_action (window->priv->action_group,
-						      "ViewFullscreen");
+		action_group = window->priv->action_group;
+
+		action = gtk_action_group_get_action (action_group, "ViewFullscreen");
 		gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), fullscreen);
+
+		action = gtk_action_group_get_action (action_group, "EditToolbar");
+		g_object_set (action, "sensitive", !fullscreen, NULL);
 	}
 
 	return FALSE;