diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmark-action.c | 26 | ||||
| -rw-r--r-- | src/bookmarks/ephy-topic-action.c | 26 |
3 files changed, 9 insertions, 52 deletions
@@ -1,5 +1,14 @@ 2004-07-11 Marco Pesenti Gritti <marco@gnome.org> + * lib/egg/egg-editable-toolbar.c: (toolbar_drag_motion_cb): + * src/bookmarks/ephy-bookmark-action.c: (connect_proxy): + * src/bookmarks/ephy-topic-action.c: (connect_proxy): + + Disable sliding when not in toolbar editing mode. + We cant assume GDK_ACTION_MOVE there. + +2004-07-11 Marco Pesenti Gritti <marco@gnome.org> + * src/bookmarks/ephy-topic-action.c: (stop_drag_check), (button_release_cb), (button_press_cb): diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c index 40d6987d3..f37fe4137 100644 --- a/src/bookmarks/ephy-bookmark-action.c +++ b/src/bookmarks/ephy-bookmark-action.c @@ -383,28 +383,6 @@ stop_drag_check (EphyBookmarkAction *action, GtkWidget *widget) } static void -drag_begin_cb (GtkWidget *widget, GdkDragContext *context, EphyBookmarkAction *action) -{ - GtkWidget *tool_item; - - tool_item = gtk_widget_get_ancestor (widget, GTK_TYPE_TOOL_ITEM); - g_return_if_fail (tool_item != NULL); - - gtk_widget_hide (widget); -} - -static void -drag_end_cb (GtkWidget *widget, GdkDragContext *context, EphyBookmarkAction *action) -{ - GtkWidget *tool_item; - - tool_item = gtk_widget_get_ancestor (widget, GTK_TYPE_TOOL_ITEM); - g_return_if_fail (tool_item != NULL); - - gtk_widget_show (widget); -} - -static void drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint32 time, EphyBookmarkAction *action) @@ -661,10 +639,6 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) G_CALLBACK (drag_data_get_cb), action); g_signal_connect (button, "drag_data_delete", G_CALLBACK (drag_data_delete_cb), action); - g_signal_connect (button, "drag_begin", - G_CALLBACK (drag_begin_cb), action); - g_signal_connect (button, "drag_end", - G_CALLBACK (drag_end_cb), action); entry = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "entry")); g_signal_connect (entry, "activate", G_CALLBACK (activate_cb), action); diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c index 5c9931671..0406d5c8b 100644 --- a/src/bookmarks/ephy-topic-action.c +++ b/src/bookmarks/ephy-topic-action.c @@ -585,28 +585,6 @@ build_menu (EphyTopicAction *action) } static void -drag_begin_cb (GtkWidget *widget, GdkDragContext *context, EphyTopicAction *action) -{ - GtkWidget *tool_item; - - tool_item = gtk_widget_get_ancestor (widget, GTK_TYPE_TOOL_ITEM); - g_return_if_fail (tool_item != NULL); - - gtk_widget_hide (widget); -} - -static void -drag_end_cb (GtkWidget *widget, GdkDragContext *context, EphyTopicAction *action) -{ - GtkWidget *tool_item; - - tool_item = gtk_widget_get_ancestor (widget, GTK_TYPE_TOOL_ITEM); - g_return_if_fail (tool_item != NULL); - - gtk_widget_show (widget); -} - -static void drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint32 time, EphyTopicAction *action) @@ -877,10 +855,6 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) G_CALLBACK (drag_data_get_cb), action); g_signal_connect (button, "drag_data_delete", G_CALLBACK (drag_data_delete_cb), action); - g_signal_connect (button, "drag_begin", - G_CALLBACK (drag_begin_cb), action); - g_signal_connect (button, "drag_end", - G_CALLBACK (drag_end_cb), action); } } |