aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-window.c15
2 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 904468cfc..f59045853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-02 Peter Harvey <peter.a.harvey@gmail.com>
+
+ * src/ephy-window.c
+
+ Fix a bug introduced in my last patch where statusbar visibility
+ was inverted from what it should have been.
+
2006-03-02 Christian Persch <chpe@cvs.gnome.org>
* src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import):
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 0bddd0f2c..be9cfdbf0 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3646,14 +3646,17 @@ sync_prefs_with_chrome (EphyWindow *window)
}
static void
-sync_chrome_with_view_toggle (GtkAction *action, EphyWindow *window,
- EphyEmbedChrome chrome_flag)
+sync_chrome_with_view_toggle (GtkAction *action,
+ EphyWindow *window,
+ EphyEmbedChrome chrome_flag,
+ gboolean invert)
{
gboolean active;
active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
- window->priv->chrome = active ? window->priv->chrome & (~chrome_flag) :
- window->priv->chrome | chrome_flag;
+ window->priv->chrome = (active != invert) ?
+ window->priv->chrome | chrome_flag :
+ window->priv->chrome & (~chrome_flag);
sync_chromes_visibility (window);
sync_prefs_with_chrome (window);
@@ -3664,7 +3667,7 @@ ephy_window_view_statusbar_cb (GtkAction *action,
EphyWindow *window)
{
sync_chrome_with_view_toggle (action, window,
- EPHY_EMBED_CHROME_STATUSBAR);
+ EPHY_EMBED_CHROME_STATUSBAR, FALSE);
}
static void
@@ -3672,7 +3675,7 @@ ephy_window_view_toolbar_cb (GtkAction *action,
EphyWindow *window)
{
sync_chrome_with_view_toggle (action, window,
- EPHY_EMBED_CHROME_TOOLBAR);
+ EPHY_EMBED_CHROME_TOOLBAR, TRUE);
}
static void