summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2008-06-03 18:08:48 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2008-06-03 18:08:48 +0000
commitcf62c83b0e316a50ac983f29c9921a9fbd7e6113 (patch)
treea9f7588c42af7c001bce3ab4bc0c4e64f263f8f8 /gtk
parent8ade45013cd28181af5692d12a7dd9b8b38526f0 (diff)
downloadgtk+-cf62c83b0e316a50ac983f29c9921a9fbd7e6113.tar.gz
bnc355225 - File chooser crash in Tab completion
2008-06-03 Federico Mena Quintero <federico@novell.com> * gtk/gtkfilechooserentry.c (install_completion_feedback_timer): If the user presses Tab while the completion feedback window is active, then we'll assert. Remove the assertion and just re-set the timer. Fixes https://bugzilla.novell.com/show_bug.cgi?id=355225 Signed-off-by: Federico Mena Quintero <federico@novell.com> svn path=/trunk/; revision=20305
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkfilechooserentry.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index aef6d312c8..a98041aabd 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -939,7 +939,8 @@ completion_feedback_timeout_cb (gpointer data)
static void
install_completion_feedback_timer (GtkFileChooserEntry *chooser_entry)
{
- g_assert (chooser_entry->completion_feedback_timeout_id == 0);
+ if (chooser_entry->completion_feedback_timeout_id != 0)
+ g_source_remove (chooser_entry->completion_feedback_timeout_id);
chooser_entry->completion_feedback_timeout_id = gdk_threads_add_timeout (COMPLETION_FEEDBACK_TIMEOUT_MS,
completion_feedback_timeout_cb,