summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gtk/gtkfilechooserentry.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 70165ae03..44f8c04ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
+
2008-06-03 Colin Walters <walters@redhat.com>
Bug 535303 – add _get_implementation to GtkStatusIcon
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index aef6d312c..a98041aab 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,