callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle double queuing, rather than asserting that it does not happen.

Browse Source 
2006-03-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (queue_edited_idle): Handle
	double queuing, rather than asserting that it does not
	happen.  (#330617)
This commit is contained in:
Matthias Clasen
2006-03-29 05:35:00 +00:00
committed by Matthias Clasen
parent 9bf4ee872c
commit a560c6ba97
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (queue_edited_idle): Handle
double queuing, rather than asserting that it does not
happen. (#330617)
2006-03-28 Matthias Clasen <mclasen@redhat.com> 2006-03-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_detachable): Fix * gtk/gtknotebook.c (gtk_notebook_set_tab_detachable): Fix

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2006-03-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (queue_edited_idle): Handle
double queuing, rather than asserting that it does not
happen. (#330617)
2006-03-28 Matthias Clasen <mclasen@redhat.com> 2006-03-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_tab_detachable): Fix * gtk/gtknotebook.c (gtk_notebook_set_tab_detachable): Fix

20
gtk/gtkfilechooserdefault.c
View File

@ -1891,17 +1891,17 @@ queue_edited_idle (GtkFileChooserDefault *impl,
* just now. * just now.
*/ */
g_assert (!impl->edited_idle); if (!impl->edited_idle)
g_assert (!impl->edited_new_text); {
impl->edited_idle = g_idle_source_new ();
g_source_set_closure (impl->edited_idle,
g_cclosure_new_object (G_CALLBACK (edited_idle_cb),
G_OBJECT (impl)));
g_source_attach (impl->edited_idle, NULL);
}
impl->edited_idle = g_idle_source_new (); g_free (impl->edited_new_text);
g_source_set_closure (impl->edited_idle, impl->edited_new_text = g_strdup (new_text);
g_cclosure_new_object (G_CALLBACK (edited_idle_cb),
G_OBJECT (impl)));
g_source_attach (impl->edited_idle, NULL);
if (new_text)
impl->edited_new_text = g_strdup (new_text);
} }
/* Callback used from the text cell renderer when the new folder is named */ /* Callback used from the text cell renderer when the new folder is named */