diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | lib/egg/egg-editable-toolbar.c | 7 |
2 files changed, 10 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2004-07-01 Marco Pesenti Gritti <marco@gnome.org> + * lib/egg/egg-editable-toolbar.c: (toolbar_drag_motion_cb): + + Do not allow dragging out of edit mode on ITEMS_ONLY toolbars. + +2004-07-01 Marco Pesenti Gritti <marco@gnome.org> + * src/bookmarks/ephy-bookmark-action.c: (ephy_bookmark_action_sync_icon): diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 1006a1e02..3ad616b1c 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -615,9 +615,10 @@ toolbar_drag_motion_cb (GtkWidget *widget, pos = get_toolbar_position (etoolbar, widget); flags = egg_toolbars_model_get_flags (etoolbar->priv->model, pos); - if ((flags & EGG_TB_MODEL_ACCEPT_ITEMS_ONLY) && - !gtk_widget_get_ancestor (source, EGG_TYPE_EDITABLE_TOOLBAR) && - !gtk_widget_get_ancestor (source, EGG_TYPE_TOOLBAR_EDITOR)) + if (!etoolbar->priv->edit_mode || + ((flags & EGG_TB_MODEL_ACCEPT_ITEMS_ONLY) && + !gtk_widget_get_ancestor (source, EGG_TYPE_EDITABLE_TOOLBAR) && + !gtk_widget_get_ancestor (source, EGG_TYPE_TOOLBAR_EDITOR))) { gdk_drag_status (context, 0, time); return FALSE; |