aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xlib/egg/egg-editable-toolbar.c5
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2894c2625..90e8a5278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-08 Marco Pesenti Gritti <marco@gnome.org>
+
+ * lib/egg/egg-editable-toolbar.c: (toolbar_drag_motion_cb):
+
+ When moving in the same toolbar force GDK_ACTION_MOVE.
+ Fix #145529
+
2004-07-07 Christian Persch <chpe@cvs.gnome.org>
* embed/print-dialog.c: (ephy_print_get_print_info):
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 63dbe3384..87777c803 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -625,6 +625,11 @@ toolbar_drag_motion_cb (GtkWidget *widget,
gdk_drag_status (context, 0, time);
return FALSE;
}
+
+ if (gtk_widget_is_ancestor (source, widget))
+ {
+ context->suggested_action = GDK_ACTION_MOVE;
+ }
}
target = gtk_drag_dest_find_target (widget, context, NULL);