gtk+ r20305 - in trunk: . gtk

[federico svn gnome org]

Author: federico
Date: Tue Jun  3 18:08:48 2008
New Revision: 20305
URL: http://svn.gnome.org/viewvc/gtk+?rev=20305&view=rev

Log:
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>


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfilechooserentry.c

Modified: trunk/gtk/gtkfilechooserentry.c
==============================================================================
--- trunk/gtk/gtkfilechooserentry.c	(original)
+++ trunk/gtk/gtkfilechooserentry.c	Tue Jun  3 18:08:48 2008
@@ -939,7 +939,8 @@
 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,