From ea51ac13f87da6abc7070fa4635ac72243e3f547 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 17 Jun 2008 12:46:12 +0000 Subject: [PATCH] Remove the GtkRecentManager screen dance, as it has been deprecated since 2008-06-17 Emmanuele Bassi * gtk/gtkfilechooserdefault.c: (gtk_file_chooser_default_init), (gtk_file_chooser_default_constructor), (gtk_file_chooser_default_screen_changed), (recent_start_loading): Remove the GtkRecentManager screen dance, as it has been deprecated since 2.12. Now we get the GtkRecentManager singleton whewn we create the FileChooserDefault instance. (Michael Natterer) svn path=/trunk/; revision=20419 --- ChangeLog | 11 +++++++++++ gtk/gtkfilechooserdefault.c | 27 +-------------------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc0c1badd..8a9d39e34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-06-17 Emmanuele Bassi + + * gtk/gtkfilechooserdefault.c: + (gtk_file_chooser_default_init), + (gtk_file_chooser_default_constructor), + (gtk_file_chooser_default_screen_changed), + (recent_start_loading): Remove the GtkRecentManager screen + dance, as it has been deprecated since 2.12. Now we get the + GtkRecentManager singleton whewn we create the FileChooserDefault + instance. (Michael Natterer) + 2008-06-17 Michael Natterer * gtk/gtkoptionmenu.c (gtk_option_menu_position): cast menu's diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index dcd4ea467..ff3adce91 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -484,7 +484,6 @@ static void search_get_valid_child_iter (GtkFileChooserDefault *impl, GtkTreeIter *child_iter, GtkTreeIter *iter); -static void recent_manager_update (GtkFileChooserDefault *impl); static void recent_stop_loading (GtkFileChooserDefault *impl); static void recent_clear_model (GtkFileChooserDefault *impl, gboolean remove_from_treeview); @@ -829,6 +828,7 @@ _gtk_file_chooser_default_init (GtkFileChooserDefault *impl) impl->pending_select_files = NULL; impl->location_mode = LOCATION_MODE_PATH_BAR; impl->operation_mode = OPERATION_MODE_BROWSE; + impl->recent_manager = gtk_recent_manager_get_default (); gtk_box_set_spacing (GTK_BOX (impl), 12); @@ -5236,9 +5236,6 @@ gtk_file_chooser_default_constructor (GType type, gtk_widget_push_composite_child (); - /* Recent files manager */ - recent_manager_update (impl); - /* Shortcuts model */ shortcuts_model_create (impl); @@ -5841,24 +5838,6 @@ check_icon_theme (GtkFileChooserDefault *impl) profile_end ("end", NULL); } -static void -recent_manager_update (GtkFileChooserDefault *impl) -{ - GtkRecentManager *manager; - - profile_start ("start", NULL); - - if (gtk_widget_has_screen (GTK_WIDGET (impl))) - manager = gtk_recent_manager_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl))); - else - manager = gtk_recent_manager_get_default (); - - if (impl->recent_manager != manager) - impl->recent_manager = manager; - - profile_end ("end", NULL); -} - static void gtk_file_chooser_default_style_set (GtkWidget *widget, GtkStyle *previous_style) @@ -5899,7 +5878,6 @@ gtk_file_chooser_default_screen_changed (GtkWidget *widget, remove_settings_signal (impl, previous_screen); check_icon_theme (impl); - recent_manager_update (impl); g_signal_emit_by_name (widget, "default-size-changed"); @@ -9804,9 +9782,6 @@ recent_start_loading (GtkFileChooserDefault *impl) recent_setup_model (impl); set_busy_cursor (impl, TRUE); - if (!impl->recent_manager) - recent_manager_update (impl); - g_assert (impl->load_recent_id == 0); load_data = g_new (RecentLoadData, 1); -- 2.43.2