AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merged from gtk-2-6:

Browse Source 
2005-02-01  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-6:

	* gtk/gtkfilechooserdefault.c
	(browse_files_model_finished_loading_cb): Don't
	g_assert_not_reached() if we are in any other state.  Another code
	path may have triggered a folder reload.  Fixes #165556.
This commit is contained in:
Federico Mena Quintero 2005-02-02 00:53:10 +00:00 committed by Federico Mena Quintero
parent 224c47a9b8
commit 4200bed6be
4 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c
(browse_files_model_finished_loading_cb): Don't
g_assert_not_reached() if we are in any other state. Another code
path may have triggered a folder reload. Fixes #165556.
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c
(browse_files_model_finished_loading_cb): Don't
g_assert_not_reached() if we are in any other state. Another code
path may have triggered a folder reload. Fixes #165556.
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c
(browse_files_model_finished_loading_cb): Don't
g_assert_not_reached() if we are in any other state. Another code
path may have triggered a folder reload. Fixes #165556.
2005-02-01 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:

7
gtk/gtkfilechooserdefault.c
View File

@ -4612,7 +4612,12 @@ browse_files_model_finished_loading_cb (GtkFileSystemModel *model,
/* Nothing */
}
else
g_assert_not_reached ();
{
/* We can't g_assert_not_reached(), as something other than us may have
* initiated a folder reload. See #165556.
*/
return;
}
g_assert (impl->load_timeout_id == 0);