From 10ae5ad60f8931c480ec76c0b1d0722150b03ed5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 20 Dec 2006 20:57:49 +0000 Subject: [PATCH] Silently return if a drag is already in progress, rather than asserting. 2006-12-20 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_start_selection_drag): Silently return if a drag is already in progress, rather than asserting. (#335622, Li Yuan, testcase by Erwann Chenede) --- ChangeLog | 4 ++++ gtk/gtktextview.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2d5b57fa94..135d70f27d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-12-20 Matthias Clasen + * gtk/gtktextview.c (gtk_text_view_start_selection_drag): + Silently return if a drag is already in progress, rather + than asserting. (#335622, Li Yuan, testcase by Erwann Chenede) + * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog): Allow any GtkDialog that implements GtkFileChooser as dialog. (#335473, Tommi Komulainen) diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 359e48abcf..3a88622631 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -5768,7 +5768,8 @@ gtk_text_view_start_selection_drag (GtkTextView *text_view, GtkTextBuffer *buffer; SelectionData *data; - g_assert (text_view->selection_drag_handler == 0); + if (text_view->selection_drag_handler != 0) + return; data = g_new0 (SelectionData, 1);