From 14c2f5ec0db32d2c9c08cb4a5af0edb210968de5 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@src.gnome.org>
Date: Thu, 1 Jul 2004 10:00:40 +0000
Subject: *** empty log message ***
---
lib/egg/egg-editable-toolbar.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'lib/egg')
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;
--
cgit