From 0e419aaf06e325e0ad4b6c7a9929e66773a3fb74 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 11 Jul 2004 11:06:57 +0000 Subject: Make sure we stop the drag check also when button is released while the 2004-07-11 Marco Pesenti Gritti * src/bookmarks/ephy-topic-action.c: (stop_drag_check), (button_release_cb), (button_press_cb): Make sure we stop the drag check also when button is released while the menu grab is still in effect. --- ChangeLog | 8 ++++++++ src/bookmarks/ephy-topic-action.c | 20 ++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e2a44548..6ccd37169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-07-11 Marco Pesenti Gritti + + * src/bookmarks/ephy-topic-action.c: (stop_drag_check), + (button_release_cb), (button_press_cb): + + Make sure we stop the drag check also when button + is released while the menu grab is still in effect. + 2004-07-11 Marco Pesenti Gritti * lib/egg/egg-toolbars-model.c: (egg_toolbars_model_move_item): diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c index 80994db8f..5c9931671 100644 --- a/src/bookmarks/ephy-topic-action.c +++ b/src/bookmarks/ephy-topic-action.c @@ -56,6 +56,7 @@ struct EphyTopicActionPrivate EphyNode *topic_node; guint motion_handler; + guint release_handler; gint drag_x; gint drag_y; }; @@ -632,7 +633,7 @@ drag_data_delete_cb (GtkWidget *widget, GdkDragContext *context, remove_from_model (widget); } -static gboolean +static void stop_drag_check (EphyTopicAction *action, GtkWidget *widget) { if (action->priv->motion_handler) @@ -640,10 +641,9 @@ stop_drag_check (EphyTopicAction *action, GtkWidget *widget) g_signal_handler_disconnect (widget, action->priv->motion_handler); action->priv->motion_handler = 0; - return TRUE; + g_signal_handler_disconnect (widget, action->priv->release_handler); + action->priv->release_handler = 0; } - - return FALSE; } static gboolean @@ -798,7 +798,12 @@ button_release_cb (GtkWidget *widget, if (event->button == 1) { stop_drag_check (action, widget); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); + + if (GTK_IS_TOGGLE_BUTTON (widget)) + { + gtk_toggle_button_set_active + (GTK_TOGGLE_BUTTON (widget), FALSE); + } } return FALSE; @@ -827,7 +832,10 @@ button_press_cb (GtkWidget *widget, action->priv->motion_handler = g_signal_connect (menu, "motion_notify_event", G_CALLBACK (drag_motion_cb), action); - + action->priv->release_handler = g_signal_connect + (menu, "button_release_event", + G_CALLBACK (button_release_cb), action); + return TRUE; } } -- cgit v1.2.3