aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@src.gnome.org>2004-07-01 18:00:40 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-07-01 18:00:40 +0800
commit14c2f5ec0db32d2c9c08cb4a5af0edb210968de5 (patch)
treebe952e54c61dfb843f1e020cb2d0d4eb2334c5a3 /lib
parent49390b4e0047fbb33312988906b95e673ce146db (diff)
downloadgsoc2013-epiphany-14c2f5ec0db32d2c9c08cb4a5af0edb210968de5.tar
gsoc2013-epiphany-14c2f5ec0db32d2c9c08cb4a5af0edb210968de5.tar.gz
gsoc2013-epiphany-14c2f5ec0db32d2c9c08cb4a5af0edb210968de5.tar.bz2
gsoc2013-epiphany-14c2f5ec0db32d2c9c08cb4a5af0edb210968de5.tar.lz
gsoc2013-epiphany-14c2f5ec0db32d2c9c08cb4a5af0edb210968de5.tar.xz
gsoc2013-epiphany-14c2f5ec0db32d2c9c08cb4a5af0edb210968de5.tar.zst
gsoc2013-epiphany-14c2f5ec0db32d2c9c08cb4a5af0edb210968de5.zip
*** empty log message ***
Diffstat (limited to 'lib')
-rwxr-xr-xlib/egg/egg-editable-toolbar.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 3ad616b1c..63dbe3384 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -611,14 +611,16 @@ toolbar_drag_motion_cb (GtkWidget *widget,
{
EggTbModelFlags flags;
int pos;
+ gboolean is_item;
pos = get_toolbar_position (etoolbar, widget);
flags = egg_toolbars_model_get_flags (etoolbar->priv->model, pos);
- 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)))
+ is_item = etoolbar->priv->edit_mode &&
+ (gtk_widget_get_ancestor (source, EGG_TYPE_EDITABLE_TOOLBAR) ||
+ gtk_widget_get_ancestor (source, EGG_TYPE_TOOLBAR_EDITOR));
+
+ if ((flags & EGG_TB_MODEL_ACCEPT_ITEMS_ONLY) && !is_item)
{
gdk_drag_status (context, 0, time);
return FALSE;