Deprecate widget flag: GTK_WIDGET_MAPPED

[~andy/gtk] / gtk / gtkfilechooserdefault.c

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 1dcd09f4471b62293d7d9a63f60ec26461232164..c2f29e9cdd5b929450aa15825ab61b02b7308530 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -405,6 +405,8 @@ static void location_button_toggled_cb (GtkToggleButton *toggle,
                                        GtkFileChooserDefault *impl);
 static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
 
+static void stop_loading_and_clear_list_model (GtkFileChooserDefault *impl,
+                                               gboolean remove_from_treeview);
 static void     search_stop_searching        (GtkFileChooserDefault *impl,
                                               gboolean               remove_query);
 static void     search_clear_model           (GtkFileChooserDefault *impl, 
@@ -879,15 +881,14 @@ gtk_file_chooser_default_finalize (GObject *object)
   if (impl->browse_path_bar_size_group)
     g_object_unref (impl->browse_path_bar_size_group);
 
-  load_remove_timer (impl);
-
   /* Free all the Models we have */
-  if (impl->browse_files_model)
-    g_object_unref (impl->browse_files_model);
-
+  stop_loading_and_clear_list_model (impl, FALSE);
   search_clear_model (impl, FALSE);
   recent_clear_model (impl, FALSE);
 
+  /* stopping the load above should have cleared this */
+  g_assert (impl->load_timeout_id == 0);
+
   g_free (impl->preview_display_name);
 
   g_free (impl->edited_new_text);
@@ -926,7 +927,7 @@ get_toplevel (GtkWidget *widget)
   GtkWidget *toplevel;
 
   toplevel = gtk_widget_get_toplevel (widget);
-  if (!GTK_WIDGET_TOPLEVEL (toplevel))
+  if (!gtk_widget_is_toplevel (toplevel))
     return NULL;
   else
     return GTK_WINDOW (toplevel);
@@ -1108,7 +1109,7 @@ update_preview_widget_visibility (GtkFileChooserDefault *impl)
   else
     gtk_widget_hide (impl->preview_box);
 
-  if (!GTK_WIDGET_MAPPED (impl))
+  if (!gtk_widget_get_mapped (GTK_WIDGET (impl)))
     emit_default_size_changed (impl);
 }
 
@@ -3970,7 +3971,7 @@ browse_files_key_press_event_cb (GtkWidget   *widget,
       if (window
          && widget != window->default_widget
          && !(widget == window->focus_widget &&
-              (!window->default_widget || !GTK_WIDGET_SENSITIVE (window->default_widget))))
+              (!window->default_widget || !gtk_widget_get_sensitive (window->default_widget))))
        {
          gtk_window_activate_default (window);
          return TRUE;
@@ -5050,7 +5051,7 @@ location_toggle_popup_handler (GtkFileChooserDefault *impl)
     }
   else if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)
     {
-      if (GTK_WIDGET_HAS_FOCUS (impl->location_entry))
+      if (gtk_widget_has_focus (impl->location_entry))
         {
           location_mode_set (impl, LOCATION_MODE_PATH_BAR, TRUE);
         }
@@ -6407,7 +6408,8 @@ pending_select_files_process (GtkFileChooserDefault *impl)
        * that case, the chooser's selection should be what the caller expects,
        * as the user can't see that something else got selected.  See bug #165264.
        */
-      if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
+      if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN &&
+          gtk_widget_get_mapped (GTK_WIDGET (impl)))
        browse_files_select_first_row (impl);
     }
 
@@ -6480,7 +6482,8 @@ browse_files_model_finished_loading_cb (GtkFileSystemModel    *model,
 }
 
 static void
-stop_loading_and_clear_list_model (GtkFileChooserDefault *impl)
+stop_loading_and_clear_list_model (GtkFileChooserDefault *impl,
+                                   gboolean remove_from_treeview)
 {
   load_remove_timer (impl); /* This changes the state to LOAD_EMPTY */
   
@@ -6490,7 +6493,8 @@ stop_loading_and_clear_list_model (GtkFileChooserDefault *impl)
       impl->browse_files_model = NULL;
     }
 
-  gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
+  if (remove_from_treeview)
+    gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
 }
 
 static char *
@@ -6760,10 +6764,9 @@ set_list_model (GtkFileChooserDefault *impl,
 
   profile_start ("start", NULL);
 
-  stop_loading_and_clear_list_model (impl);
+  stop_loading_and_clear_list_model (impl, TRUE);
 
   set_busy_cursor (impl, TRUE);
-  gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
 
   impl->browse_files_model = 
     _gtk_file_system_model_new_for_directory (impl->current_folder,
@@ -8028,14 +8031,14 @@ gtk_file_chooser_default_get_default_size (GtkFileChooserEmbed *chooser_embed,
 
       if (impl->preview_widget_active &&
          impl->preview_widget &&
-         GTK_WIDGET_VISIBLE (impl->preview_widget))
+         gtk_widget_get_visible (impl->preview_widget))
        {
          gtk_widget_size_request (impl->preview_box, &req);
          *default_width += PREVIEW_HBOX_SPACING + req.width;
        }
 
       if (impl->extra_widget &&
-         GTK_WIDGET_VISIBLE (impl->extra_widget))
+         gtk_widget_get_visible (impl->extra_widget))
        {
          gtk_widget_size_request (impl->extra_align, &req);
          *default_height += GTK_BOX (chooser_embed)->spacing + req.height;
@@ -8143,7 +8146,7 @@ add_custom_button_to_dialog (GtkDialog   *dialog,
   GtkWidget *button;
 
   button = gtk_button_new_with_mnemonic (mnemonic_label);
-  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default (button, TRUE);
   gtk_button_set_image (GTK_BUTTON (button),
                        gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON));
   gtk_widget_show (button);
@@ -9086,7 +9089,7 @@ stop_operation (GtkFileChooserDefault *impl, OperationMode mode)
   switch (mode)
     {
     case OPERATION_MODE_BROWSE:
-      stop_loading_and_clear_list_model (impl);
+      stop_loading_and_clear_list_model (impl, TRUE);
       break;
 
     case OPERATION_MODE_SEARCH: