diff options
| -rw-r--r-- | ChangeLog | 34 | ||||
| -rwxr-xr-x | lib/egg/egg-editable-toolbar.c | 2 | ||||
| -rwxr-xr-x | lib/egg/egg-toolbars-model.h | 4 |
3 files changed, 37 insertions, 3 deletions
@@ -1,5 +1,39 @@ 2004-02-20 Christian Persch <chpe@cvs.gnome.org> + * lib/egg/egg-editable-toolbar.c: (popup_toolbar_context_menu_cb): + + Fix logic error, spotted by Crispin. + + * lib/egg/egg-toolbars-model.h: + + Make it clear that EggTbModelFlags is a bitfield enum. + +2004-02-20 Christian Persch <chpe@cvs.gnome.org> + + * doc/reference/tmpl/EphyContentPolicy.sgml: + * doc/reference/tmpl/EphySingle.sgml: + * doc/reference/tmpl/ephy-cookie-manager.sgml: + * doc/reference/tmpl/ephy-embed-factory.sgml: + * doc/reference/tmpl/ephy-embed-single.sgml: + * doc/reference/tmpl/ephy-password-manager.sgml: + * doc/reference/tmpl/ephy-permission-manager.sgml: + * doc/reference/tmpl/ephy-session.sgml: + * doc/reference/tmpl/ephy-shell.sgml: + * doc/reference/tmpl/mozilla-embed-event.sgml: + * embed/mozilla/EphyBrowser.cpp: + * embed/mozilla/EventContext.cpp: + * embed/mozilla/Makefile.am: + * lib/ephy-debug.c: + * lib/ephy-dialog.c: (connect_signals): + * lib/ephy-file-helpers.c: + * lib/ephy-file-helpers.h: + * lib/ephy-glade.c: + * lib/ephy-glade.h: + * lib/ephy-gui.c: + * lib/ephy-gui.h: + +2004-02-20 Christian Persch <chpe@cvs.gnome.org> + * lib/eel-gconf-extensions.c: #ifdef HAVE_CONFIG_H the inclusion of config.h. diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index f1d496336..461d58247 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -519,7 +519,7 @@ popup_toolbar_context_menu_cb (GtkWidget *toolbar, position = get_toolbar_position (t, toolbar); flags = egg_toolbars_model_get_flags (t->priv->model, position); - if (flags && EGG_TB_MODEL_NOT_REMOVABLE) + if (flags & EGG_TB_MODEL_NOT_REMOVABLE) { gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE); } diff --git a/lib/egg/egg-toolbars-model.h b/lib/egg/egg-toolbars-model.h index 9e1f01a50..07146cb38 100755 --- a/lib/egg/egg-toolbars-model.h +++ b/lib/egg/egg-toolbars-model.h @@ -41,8 +41,8 @@ typedef struct EggToolbarsModelPrivate EggToolbarsModelPrivate; typedef enum { - EGG_TB_MODEL_NOT_REMOVABLE = 1, - EGG_TB_MODEL_ICONS_ONLY = 2 + EGG_TB_MODEL_NOT_REMOVABLE = 1 << 0, + EGG_TB_MODEL_ICONS_ONLY = 1 << 1 } EggTbModelFlags; struct EggToolbarsModel |