From 74c146301c24b2dc5146fe3fb3a60ffafb52a26a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sat, 20 Nov 2004 00:17:30 +0000 Subject: Merged from gtk-2-4: 2004-11-18 Federico Mena Quintero Merged from gtk-2-4: Fixes #155744: Try to load the whole file system model within a specified time. * gtk/gtkfilechooserdefault.c (set_list_model): Don't create and set the sort model here. Instead, set up a timer in which we'll try to load the file system model. (load_set_model): Create and set the sort model here. (load_setup_timer): New function to set up a timer and switch to the LOAD_LOADING state. (load_remove_timer): New function to unset the timer and switch to the LOAD_FINISHED state. (browse_files_model_finished_loading_cb): Remove the timer if needed and set the file system and sort model; switch to the LOAD_FINISHED state. (gtk_file_chooser_default_finalize): Remove the load timer. (gtk_file_chooser_default_init): Start in the LOAD_FINISHED state. --- ChangeLog.pre-2-6 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'ChangeLog.pre-2-6') diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f6d264bca..367c28dac 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,25 @@ +2004-11-18 Federico Mena Quintero + + Merged from gtk-2-4: + + Fixes #155744: + + Try to load the whole file system model within a specified time. + + * gtk/gtkfilechooserdefault.c (set_list_model): Don't create and + set the sort model here. Instead, set up a timer in which we'll + try to load the file system model. + (load_set_model): Create and set the sort model here. + (load_setup_timer): New function to set up a timer and switch to + the LOAD_LOADING state. + (load_remove_timer): New function to unset the timer and switch to + the LOAD_FINISHED state. + (browse_files_model_finished_loading_cb): Remove the timer if + needed and set the file system and sort model; switch to the + LOAD_FINISHED state. + (gtk_file_chooser_default_finalize): Remove the load timer. + (gtk_file_chooser_default_init): Start in the LOAD_FINISHED state. + Fri Nov 19 15:18:51 2004 Manish Singh * modules/engines/ms-windows/msw_rc_style.c -- cgit v1.2.1