aboutsummaryrefslogtreecommitdiffstats
path: root/lib/egg
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-06-13 02:38:47 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-06-13 02:38:47 +0800
commitdecb30ea6768b634476d351f3d5f5e73e4308326 (patch)
tree7fab9ecb30a1c05f3df8b64e8ae3bc64b5684697 /lib/egg
parenta31c998d5bf3e9d3ec8ddf68fc7af3974cd05670 (diff)
downloadgsoc2013-epiphany-decb30ea6768b634476d351f3d5f5e73e4308326.tar
gsoc2013-epiphany-decb30ea6768b634476d351f3d5f5e73e4308326.tar.gz
gsoc2013-epiphany-decb30ea6768b634476d351f3d5f5e73e4308326.tar.bz2
gsoc2013-epiphany-decb30ea6768b634476d351f3d5f5e73e4308326.tar.lz
gsoc2013-epiphany-decb30ea6768b634476d351f3d5f5e73e4308326.tar.xz
gsoc2013-epiphany-decb30ea6768b634476d351f3d5f5e73e4308326.tar.zst
gsoc2013-epiphany-decb30ea6768b634476d351f3d5f5e73e4308326.zip
Allow items to be dragged from toolbar editor also when in items only
2004-06-12 Marco Pesenti Gritti <marco@gnome.org> * lib/egg/egg-editable-toolbar.c: (toolbar_drag_motion_cb): Allow items to be dragged from toolbar editor also when in items only mode. * lib/egg/egg-toolbars-model.c: (egg_toolbars_model_add_separator): The type should be the same as tool items.
Diffstat (limited to 'lib/egg')
-rwxr-xr-xlib/egg/egg-editable-toolbar.c4
-rwxr-xr-xlib/egg/egg-toolbars-model.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 649935b1b..0b4ed7a45 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -24,6 +24,7 @@
#include "egg-editable-toolbar.h"
#include "egg-toolbars-model.h"
+#include "egg-toolbar-editor.h"
#include <gtk/gtkvseparator.h>
#include <gtk/gtkiconfactory.h>
@@ -613,7 +614,8 @@ toolbar_drag_motion_cb (GtkWidget *widget,
flags = egg_toolbars_model_get_flags (etoolbar->priv->model, pos);
if ((flags & EGG_TB_MODEL_ACCEPT_ITEMS_ONLY) &&
- !GTK_IS_TOOL_ITEM (source))
+ !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;
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index c4ed3217e..b6f1b8717 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -309,7 +309,7 @@ egg_toolbars_model_add_separator (EggToolbarsModel *t,
g_return_if_fail (EGG_IS_TOOLBARS_MODEL (t));
parent_node = g_node_nth_child (t->priv->toolbars, toolbar_position);
- item = toolbars_item_new ("separator", "separator", TRUE);
+ item = toolbars_item_new ("separator", EGG_TOOLBAR_ITEM_TYPE, TRUE);
node = g_node_new (item);
g_node_insert (parent_node, position, node);