[nautilus/menial-but-very-rewarding-work-that-made-my-fingers-numb: 3/7] properties-window: Use GLib macros to define type

[Carlos Soriano <csoriano src gnome org>]

commit 1e9fcce70ed2d532fe0e7176fe1354b2248751b2
Author: Ernestas Kulik <ernestask gnome org>
Date:   Fri May 18 14:18:07 2018 +0300

    properties-window: Use GLib macros to define type

 src/nautilus-properties-window.c | 494 +++++++++++++++++++--------------------
 src/nautilus-properties-window.h |  47 +---
 2 files changed, 256 insertions(+), 285 deletions(-)
---
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 08348fd68..4b51f8bad 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -79,8 +79,10 @@ typedef struct
     gboolean cancelled;
 } GroupChange;
 
-struct NautilusPropertiesWindowDetails
+struct _NautilusPropertiesWindow
 {
+    GtkDialog parent_instance;
+
     GList *original_files;
     GList *target_files;
 
@@ -230,7 +232,7 @@ is_multi_file_window (NautilusPropertiesWindow *window)
 
     count = 0;
 
-    for (l = window->details->original_files; l != NULL; l = l->next)
+    for (l = window->original_files; l != NULL; l = l->next)
     {
         if (!nautilus_file_is_gone (NAUTILUS_FILE (l->data)))
         {
@@ -253,7 +255,7 @@ get_not_gone_original_file_count (NautilusPropertiesWindow *window)
 
     count = 0;
 
-    for (l = window->details->original_files; l != NULL; l = l->next)
+    for (l = window->original_files; l != NULL; l = l->next)
     {
         if (!nautilus_file_is_gone (NAUTILUS_FILE (l->data)))
         {
@@ -269,12 +271,12 @@ get_original_file (NautilusPropertiesWindow *window)
 {
     g_return_val_if_fail (!is_multi_file_window (window), NULL);
 
-    if (window->details->original_files == NULL)
+    if (window->original_files == NULL)
     {
         return NULL;
     }
 
-    return NAUTILUS_FILE (window->details->original_files->data);
+    return NAUTILUS_FILE (window->original_files->data);
 }
 
 static NautilusFile *
@@ -294,7 +296,7 @@ get_target_file_for_original_file (NautilusFile *file)
 static NautilusFile *
 get_target_file (NautilusPropertiesWindow *window)
 {
-    return NAUTILUS_FILE (window->details->target_files->data);
+    return NAUTILUS_FILE (window->target_files->data);
 }
 
 static void
@@ -341,9 +343,9 @@ get_image_for_properties_window (NautilusPropertiesWindow  *window,
     gint icon_scale;
 
     icon = NULL;
-    icon_scale = gtk_widget_get_scale_factor (GTK_WIDGET (window->details->notebook));
+    icon_scale = gtk_widget_get_scale_factor (GTK_WIDGET (window->notebook));
 
-    for (l = window->details->original_files; l != NULL; l = l->next)
+    for (l = window->original_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
 
@@ -412,7 +414,7 @@ update_properties_window_icon (NautilusPropertiesWindow *window)
 
     surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, gtk_widget_get_scale_factor (GTK_WIDGET 
(window)),
                                                     gtk_widget_get_window (GTK_WIDGET (window)));
-    gtk_image_set_from_surface (GTK_IMAGE (window->details->icon_image), surface);
+    gtk_image_set_from_surface (GTK_IMAGE (window->icon_image), surface);
 
     g_free (name);
     g_object_unref (pixbuf);
@@ -449,7 +451,7 @@ reset_icon (NautilusPropertiesWindow *properties_window)
 {
     GList *l;
 
-    for (l = properties_window->details->original_files; l != NULL; l = l->next)
+    for (l = properties_window->original_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
 
@@ -529,7 +531,7 @@ create_image_widget (NautilusPropertiesWindow *window,
     GtkWidget *image;
 
     image = gtk_image_new ();
-    window->details->icon_image = image;
+    window->icon_image = image;
 
     update_properties_window_icon (window);
     gtk_widget_show (image);
@@ -552,7 +554,7 @@ create_image_widget (NautilusPropertiesWindow *window,
                           G_CALLBACK (select_image_button_callback), window);
     }
 
-    window->details->icon_button = button;
+    window->icon_button = button;
 
     return button != NULL ? button : image;
 }
@@ -572,47 +574,47 @@ set_name_field (NautilusPropertiesWindow *window,
      * 4) Creating entry (potentially replacing label)
      */
     use_label = is_multi_file_window (window) || !nautilus_file_can_rename (get_original_file (window));
-    new_widget = !window->details->name_field || (use_label ? GTK_IS_ENTRY (window->details->name_field) : 
GTK_IS_LABEL (window->details->name_field));
+    new_widget = !window->name_field || (use_label ? GTK_IS_ENTRY (window->name_field) : GTK_IS_LABEL 
(window->name_field));
 
     if (new_widget)
     {
-        if (window->details->name_field)
+        if (window->name_field)
         {
-            gtk_widget_destroy (window->details->name_field);
+            gtk_widget_destroy (window->name_field);
         }
 
         if (use_label)
         {
-            window->details->name_field = GTK_WIDGET
-                                              (attach_ellipsizing_value_label (window->details->basic_grid,
-                                                                               GTK_WIDGET 
(window->details->name_label),
+            window->name_field = GTK_WIDGET
+                                              (attach_ellipsizing_value_label (window->basic_grid,
+                                                                               GTK_WIDGET 
(window->name_label),
                                                                                name));
         }
         else
         {
-            window->details->name_field = gtk_entry_new ();
-            gtk_entry_set_text (GTK_ENTRY (window->details->name_field), name);
-            gtk_widget_show (window->details->name_field);
+            window->name_field = gtk_entry_new ();
+            gtk_entry_set_text (GTK_ENTRY (window->name_field), name);
+            gtk_widget_show (window->name_field);
 
-            gtk_grid_attach_next_to (window->details->basic_grid, window->details->name_field,
-                                     GTK_WIDGET (window->details->name_label),
+            gtk_grid_attach_next_to (window->basic_grid, window->name_field,
+                                     GTK_WIDGET (window->name_label),
                                      GTK_POS_RIGHT, 1, 1);
-            gtk_label_set_mnemonic_widget (GTK_LABEL (window->details->name_label), 
window->details->name_field);
+            gtk_label_set_mnemonic_widget (GTK_LABEL (window->name_label), window->name_field);
 
-            g_signal_connect_object (window->details->name_field, "focus-out-event",
+            g_signal_connect_object (window->name_field, "focus-out-event",
                                      G_CALLBACK (name_field_focus_out), window, 0);
-            g_signal_connect_object (window->details->name_field, "activate",
+            g_signal_connect_object (window->name_field, "activate",
                                      G_CALLBACK (name_field_activate), window, 0);
         }
 
-        gtk_widget_show (window->details->name_field);
+        gtk_widget_show (window->name_field);
     }
     /* Only replace text if the file's name has changed. */
     else if (original_name == NULL || strcmp (original_name, name) != 0)
     {
         if (use_label)
         {
-            gtk_label_set_text (GTK_LABEL (window->details->name_field), name);
+            gtk_label_set_text (GTK_LABEL (window->name_field), name);
         }
         else
         {
@@ -620,10 +622,10 @@ set_name_field (NautilusPropertiesWindow *window,
              * currently showing. This causes minimal ripples (e.g.
              * selection change).
              */
-            gchar *displayed_name = gtk_editable_get_chars (GTK_EDITABLE (window->details->name_field), 0, 
-1);
+            gchar *displayed_name = gtk_editable_get_chars (GTK_EDITABLE (window->name_field), 0, -1);
             if (strcmp (displayed_name, name) != 0)
             {
-                gtk_entry_set_text (GTK_ENTRY (window->details->name_field), name);
+                gtk_entry_set_text (GTK_ENTRY (window->name_field), name);
             }
             g_free (displayed_name);
         }
@@ -635,7 +637,7 @@ update_name_field (NautilusPropertiesWindow *window)
 {
     NautilusFile *file;
 
-    gtk_label_set_text_with_mnemonic (window->details->name_label,
+    gtk_label_set_text_with_mnemonic (window->name_label,
                                       ngettext ("_Name:", "_Names:",
                                                 get_not_gone_original_file_count (window)));
 
@@ -651,7 +653,7 @@ update_name_field (NautilusPropertiesWindow *window)
 
         first = TRUE;
 
-        for (l = window->details->target_files; l != NULL; l = l->next)
+        for (l = window->target_files; l != NULL; l = l->next)
         {
             file = NAUTILUS_FILE (l->data);
 
@@ -692,9 +694,9 @@ update_name_field (NautilusPropertiesWindow *window)
          * an edit in progress. If the name hasn't changed (but some other
          * aspect of the file might have), then don't clobber changes.
          */
-        if (window->details->name_field)
+        if (window->name_field)
         {
-            original_name = (const char *) g_object_get_data (G_OBJECT (window->details->name_field), 
"original_name");
+            original_name = (const char *) g_object_get_data (G_OBJECT (window->name_field), 
"original_name");
         }
 
         set_name_field (window, original_name, current_name);
@@ -702,7 +704,7 @@ update_name_field (NautilusPropertiesWindow *window)
         if (original_name == NULL ||
             g_strcmp0 (original_name, current_name) != 0)
         {
-            g_object_set_data_full (G_OBJECT (window->details->name_field),
+            g_object_set_data_full (G_OBJECT (window->name_field),
                                     "original_name",
                                     current_name,
                                     g_free);
@@ -753,12 +755,12 @@ rename_callback (NautilusFile *file,
     if (error != NULL)
     {
         nautilus_report_error_renaming_file (file,
-                                             window->details->pending_name,
+                                             window->pending_name,
                                              error,
                                              GTK_WINDOW (window));
-        if (window->details->name_field != NULL)
+        if (window->name_field != NULL)
         {
-            name_field_restore_original_name (window->details->name_field);
+            name_field_restore_original_name (window->name_field);
         }
     }
 
@@ -769,8 +771,8 @@ static void
 set_pending_name (NautilusPropertiesWindow *window,
                   const char               *name)
 {
-    g_free (window->details->pending_name);
-    window->details->pending_name = g_strdup (name);
+    g_free (window->pending_name);
+    window->pending_name = g_strdup (name);
 }
 
 static void
@@ -808,7 +810,7 @@ name_field_done_editing (GtkWidget                *name_field,
     }
     else
     {
-        original_name = (const char *) g_object_get_data (G_OBJECT (window->details->name_field),
+        original_name = (const char *) g_object_get_data (G_OBJECT (window->name_field),
                                                           "original_name");
         /* Don't rename if not changed since we read the display name.
          *  This is needed so that we don't save the display name to the
@@ -847,10 +849,10 @@ select_all_at_idle (gpointer user_data)
 
     window = NAUTILUS_PROPERTIES_WINDOW (user_data);
 
-    gtk_editable_select_region (GTK_EDITABLE (window->details->name_field),
+    gtk_editable_select_region (GTK_EDITABLE (window->name_field),
                                 0, -1);
 
-    window->details->select_idle_id = 0;
+    window->select_idle_id = 0;
 
     return FALSE;
 }
@@ -869,9 +871,9 @@ name_field_activate (GtkWidget *name_field,
     /* Accept changes. */
     name_field_done_editing (name_field, window);
 
-    if (window->details->select_idle_id == 0)
+    if (window->select_idle_id == 0)
     {
-        window->details->select_idle_id = g_idle_add (select_all_at_idle,
+        window->select_idle_id = g_idle_add (select_all_at_idle,
                                                       window);
     }
 }
@@ -922,17 +924,17 @@ clear_extension_pages (NautilusPropertiesWindow *window)
     GtkWidget *page;
 
     num_pages = gtk_notebook_get_n_pages
-                    (GTK_NOTEBOOK (window->details->notebook));
+                    (GTK_NOTEBOOK (window->notebook));
 
     for (i = 0; i < num_pages; i++)
     {
         page = gtk_notebook_get_nth_page
-                   (GTK_NOTEBOOK (window->details->notebook), i);
+                   (GTK_NOTEBOOK (window->notebook), i);
 
         if (g_object_get_data (G_OBJECT (page), "is-extension-page"))
         {
             gtk_notebook_remove_page
-                (GTK_NOTEBOOK (window->details->notebook), i);
+                (GTK_NOTEBOOK (window->notebook), i);
             num_pages--;
             i--;
         }
@@ -956,28 +958,28 @@ remove_from_dialog (NautilusPropertiesWindow *window,
     NautilusFile *original_file;
     NautilusFile *target_file;
 
-    index = g_list_index (window->details->target_files, file);
+    index = g_list_index (window->target_files, file);
     if (index == -1)
     {
-        index = g_list_index (window->details->original_files, file);
+        index = g_list_index (window->original_files, file);
         g_return_if_fail (index != -1);
     }
 
-    original_link = g_list_nth (window->details->original_files, index);
-    target_link = g_list_nth (window->details->target_files, index);
+    original_link = g_list_nth (window->original_files, index);
+    target_link = g_list_nth (window->target_files, index);
 
     g_return_if_fail (original_link && target_link);
 
     original_file = NAUTILUS_FILE (original_link->data);
     target_file = NAUTILUS_FILE (target_link->data);
 
-    window->details->original_files = g_list_remove_link (window->details->original_files, original_link);
+    window->original_files = g_list_remove_link (window->original_files, original_link);
     g_list_free (original_link);
 
-    window->details->target_files = g_list_remove_link (window->details->target_files, target_link);
+    window->target_files = g_list_remove_link (window->target_files, target_link);
     g_list_free (target_link);
 
-    g_hash_table_remove (window->details->initial_permissions, target_file);
+    g_hash_table_remove (window->initial_permissions, target_file);
 
     g_signal_handlers_disconnect_by_func (original_file,
                                           G_CALLBACK (file_changed_callback),
@@ -986,8 +988,8 @@ remove_from_dialog (NautilusPropertiesWindow *window,
                                           G_CALLBACK (file_changed_callback),
                                           window);
 
-    nautilus_file_monitor_remove (original_file, &window->details->original_files);
-    nautilus_file_monitor_remove (target_file, &window->details->target_files);
+    nautilus_file_monitor_remove (original_file, &window->original_files);
+    nautilus_file_monitor_remove (target_file, &window->target_files);
 
     nautilus_file_unref (original_file);
     nautilus_file_unref (target_file);
@@ -1017,7 +1019,7 @@ get_mime_list (NautilusPropertiesWindow *window)
     GList *l;
 
     ret = NULL;
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         ret = g_list_append (ret, nautilus_file_get_mime_type (NAUTILUS_FILE (l->data)));
     }
@@ -1028,9 +1030,9 @@ get_mime_list (NautilusPropertiesWindow *window)
 static gboolean
 start_spinner_callback (NautilusPropertiesWindow *window)
 {
-    gtk_widget_show (window->details->directory_contents_spinner);
-    gtk_spinner_start (GTK_SPINNER (window->details->directory_contents_spinner));
-    window->details->deep_count_spinner_timeout_id = 0;
+    gtk_widget_show (window->directory_contents_spinner);
+    gtk_spinner_start (GTK_SPINNER (window->directory_contents_spinner));
+    window->deep_count_spinner_timeout_id = 0;
 
     return FALSE;
 }
@@ -1038,9 +1040,9 @@ start_spinner_callback (NautilusPropertiesWindow *window)
 static void
 schedule_start_spinner (NautilusPropertiesWindow *window)
 {
-    if (window->details->deep_count_spinner_timeout_id == 0)
+    if (window->deep_count_spinner_timeout_id == 0)
     {
-        window->details->deep_count_spinner_timeout_id
+        window->deep_count_spinner_timeout_id
             = g_timeout_add_seconds (1,
                                      (GSourceFunc) start_spinner_callback,
                                      window);
@@ -1050,12 +1052,12 @@ schedule_start_spinner (NautilusPropertiesWindow *window)
 static void
 stop_spinner (NautilusPropertiesWindow *window)
 {
-    gtk_spinner_stop (GTK_SPINNER (window->details->directory_contents_spinner));
-    gtk_widget_hide (window->details->directory_contents_spinner);
-    if (window->details->deep_count_spinner_timeout_id > 0)
+    gtk_spinner_stop (GTK_SPINNER (window->directory_contents_spinner));
+    gtk_widget_hide (window->directory_contents_spinner);
+    if (window->deep_count_spinner_timeout_id > 0)
     {
-        g_source_remove (window->details->deep_count_spinner_timeout_id);
-        window->details->deep_count_spinner_timeout_id = 0;
+        g_source_remove (window->deep_count_spinner_timeout_id);
+        window->deep_count_spinner_timeout_id = 0;
     }
 }
 
@@ -1063,13 +1065,13 @@ static void
 stop_deep_count_for_file (NautilusPropertiesWindow *window,
                           NautilusFile             *file)
 {
-    if (g_list_find (window->details->deep_count_files, file))
+    if (g_list_find (window->deep_count_files, file))
     {
         g_signal_handlers_disconnect_by_func (file,
                                               G_CALLBACK (schedule_directory_contents_update),
                                               window);
         nautilus_file_unref (file);
-        window->details->deep_count_files = g_list_remove (window->details->deep_count_files, file);
+        window->deep_count_files = g_list_remove (window->deep_count_files, file);
     }
 }
 
@@ -1082,13 +1084,13 @@ start_deep_count_for_file (NautilusPropertiesWindow *window,
         return;
     }
 
-    if (!g_list_find (window->details->deep_count_files, file))
+    if (!g_list_find (window->deep_count_files, file))
     {
         nautilus_file_ref (file);
-        window->details->deep_count_files = g_list_prepend (window->details->deep_count_files, file);
+        window->deep_count_files = g_list_prepend (window->deep_count_files, file);
 
         nautilus_file_recompute_deep_counts (file);
-        if (!window->details->deep_count_finished)
+        if (!window->deep_count_finished)
         {
             g_signal_connect_object (file,
                                      "updated-deep-count-in-progress",
@@ -1126,18 +1128,18 @@ properties_window_update (NautilusPropertiesWindow *window,
             remove_from_dialog (window, changed_file);
             changed_file = NULL;
 
-            if (window->details->original_files == NULL)
+            if (window->original_files == NULL)
             {
                 return;
             }
         }
         if (changed_file == NULL ||
-            g_list_find (window->details->original_files, changed_file))
+            g_list_find (window->original_files, changed_file))
         {
             dirty_original = TRUE;
         }
         if (changed_file == NULL ||
-            g_list_find (window->details->target_files, changed_file))
+            g_list_find (window->target_files, changed_file))
         {
             dirty_target = TRUE;
         }
@@ -1159,17 +1161,17 @@ properties_window_update (NautilusPropertiesWindow *window,
 
     if (dirty_target)
     {
-        for (l = window->details->permission_buttons; l != NULL; l = l->next)
+        for (l = window->permission_buttons; l != NULL; l = l->next)
         {
             permission_button_update (window, GTK_TOGGLE_BUTTON (l->data));
         }
 
-        for (l = window->details->permission_combos; l != NULL; l = l->next)
+        for (l = window->permission_combos; l != NULL; l = l->next)
         {
             permission_combo_update (window, GTK_COMBO_BOX (l->data));
         }
 
-        for (l = window->details->value_fields; l != NULL; l = l->next)
+        for (l = window->value_fields; l != NULL; l = l->next)
         {
             value_field_update (window, GTK_LABEL (l->data));
         }
@@ -1177,19 +1179,19 @@ properties_window_update (NautilusPropertiesWindow *window,
 
     mime_list = get_mime_list (window);
 
-    if (!window->details->mime_list)
+    if (!window->mime_list)
     {
-        window->details->mime_list = mime_list;
+        window->mime_list = mime_list;
     }
     else
     {
-        if (!mime_list_equal (window->details->mime_list, mime_list))
+        if (!mime_list_equal (window->mime_list, mime_list))
         {
             refresh_extension_pages (window);
         }
 
-        g_list_free_full (window->details->mime_list, g_free);
-        window->details->mime_list = mime_list;
+        g_list_free_full (window->mime_list, g_free);
+        window->mime_list = mime_list;
     }
 }
 
@@ -1200,19 +1202,19 @@ update_files_callback (gpointer data)
 
     window = NAUTILUS_PROPERTIES_WINDOW (data);
 
-    window->details->update_files_timeout_id = 0;
+    window->update_files_timeout_id = 0;
 
-    properties_window_update (window, window->details->changed_files);
+    properties_window_update (window, window->changed_files);
 
-    if (window->details->original_files == NULL)
+    if (window->original_files == NULL)
     {
         /* Close the window if no files are left */
         gtk_widget_destroy (GTK_WIDGET (window));
     }
     else
     {
-        nautilus_file_list_free (window->details->changed_files);
-        window->details->changed_files = NULL;
+        nautilus_file_list_free (window->changed_files);
+        window->changed_files = NULL;
     }
 
     return FALSE;
@@ -1223,9 +1225,9 @@ schedule_files_update (NautilusPropertiesWindow *window)
 {
     g_assert (NAUTILUS_IS_PROPERTIES_WINDOW (window));
 
-    if (window->details->update_files_timeout_id == 0)
+    if (window->update_files_timeout_id == 0)
     {
-        window->details->update_files_timeout_id
+        window->update_files_timeout_id
             = g_timeout_add (FILES_UPDATE_INTERVAL,
                              update_files_callback,
                              window);
@@ -1364,8 +1366,8 @@ value_field_update (NautilusPropertiesWindow *window,
 
     value_field_update_internal (label,
                                  (use_original ?
-                                  window->details->original_files :
-                                  window->details->target_files));
+                                  window->original_files :
+                                  window->target_files));
 }
 
 static GtkLabel *
@@ -1465,7 +1467,7 @@ attach_value_field_internal (NautilusPropertiesWindow *window,
 
     g_object_set_data (G_OBJECT (value_field), "show_original", GINT_TO_POINTER (show_original));
 
-    window->details->value_fields = g_list_prepend (window->details->value_fields,
+    window->value_fields = g_list_prepend (window->value_fields,
                                                     value_field);
     return GTK_WIDGET (value_field);
 }
@@ -1532,9 +1534,9 @@ group_change_callback (NautilusFile *file,
     }
 
     window = NAUTILUS_PROPERTIES_WINDOW (change->window);
-    if (window->details->group_change == change)
+    if (window->group_change == change)
     {
-        window->details->group_change = NULL;
+        window->group_change = NULL;
     }
 
     group_change_free (change);
@@ -1580,7 +1582,7 @@ schedule_group_change (NautilusPropertiesWindow *window,
     GroupChange *change;
 
     g_assert (NAUTILUS_IS_PROPERTIES_WINDOW (window));
-    g_assert (window->details->group_change == NULL);
+    g_assert (window->group_change == NULL);
     g_assert (NAUTILUS_IS_FILE (file));
 
     change = g_new0 (GroupChange, 1);
@@ -1593,7 +1595,7 @@ schedule_group_change (NautilusPropertiesWindow *window,
                        (GSourceFunc) schedule_group_change_timeout,
                        change);
 
-    window->details->group_change = change;
+    window->group_change = change;
 }
 
 static void
@@ -1603,7 +1605,7 @@ unschedule_or_cancel_group_change (NautilusPropertiesWindow *window)
 
     g_assert (NAUTILUS_IS_PROPERTIES_WINDOW (window));
 
-    change = window->details->group_change;
+    change = window->group_change;
 
     if (change != NULL)
     {
@@ -1619,7 +1621,7 @@ unschedule_or_cancel_group_change (NautilusPropertiesWindow *window)
             group_change_free (change);
         }
 
-        window->details->group_change = NULL;
+        window->group_change = NULL;
     }
 }
 
@@ -1953,9 +1955,9 @@ owner_change_callback (NautilusFile *file,
     }
 
     window = NAUTILUS_PROPERTIES_WINDOW (change->window);
-    if (window->details->owner_change == change)
+    if (window->owner_change == change)
     {
-        window->details->owner_change = NULL;
+        window->owner_change = NULL;
     }
 
     owner_change_free (change);
@@ -2001,7 +2003,7 @@ schedule_owner_change (NautilusPropertiesWindow *window,
     OwnerChange *change;
 
     g_assert (NAUTILUS_IS_PROPERTIES_WINDOW (window));
-    g_assert (window->details->owner_change == NULL);
+    g_assert (window->owner_change == NULL);
     g_assert (NAUTILUS_IS_FILE (file));
 
     change = g_new0 (OwnerChange, 1);
@@ -2014,7 +2016,7 @@ schedule_owner_change (NautilusPropertiesWindow *window,
                        (GSourceFunc) schedule_owner_change_timeout,
                        change);
 
-    window->details->owner_change = change;
+    window->owner_change = change;
 }
 
 static void
@@ -2024,7 +2026,7 @@ unschedule_or_cancel_owner_change (NautilusPropertiesWindow *window)
 
     g_assert (NAUTILUS_IS_PROPERTIES_WINDOW (window));
 
-    change = window->details->owner_change;
+    change = window->owner_change;
 
     if (change != NULL)
     {
@@ -2042,7 +2044,7 @@ unschedule_or_cancel_owner_change (NautilusPropertiesWindow *window)
             owner_change_free (change);
         }
 
-        window->details->owner_change = NULL;
+        window->owner_change = NULL;
     }
 }
 
@@ -2252,15 +2254,15 @@ directory_contents_value_field_update (NautilusPropertiesWindow *window)
 
     g_assert (NAUTILUS_IS_PROPERTIES_WINDOW (window));
 
-    total_count = window->details->total_count;
-    total_size = window->details->total_size;
+    total_count = window->total_count;
+    total_size = window->total_size;
     unreadable_directory_count = FALSE;
 
-    for (l = window->details->target_files; l; l = l->next)
+    for (l = window->target_files; l; l = l->next)
     {
         file = NAUTILUS_FILE (l->data);
 
-        if (file_has_prefix (file, window->details->target_files))
+        if (file_has_prefix (file, window->target_files))
         {
             /* don't count nested files twice */
             continue;
@@ -2294,12 +2296,12 @@ directory_contents_value_field_update (NautilusPropertiesWindow *window)
         }
     }
 
-    deep_count_active = (window->details->deep_count_files != NULL);
+    deep_count_active = (window->deep_count_files != NULL);
     /* If we've already displayed the total once, don't do another visible
      * count-up if the deep_count happens to get invalidated.
      * But still display the new total, since it might have changed.
      */
-    if (window->details->deep_count_finished && deep_count_active)
+    if (window->deep_count_finished && deep_count_active)
     {
         return;
     }
@@ -2346,7 +2348,7 @@ directory_contents_value_field_update (NautilusPropertiesWindow *window)
         }
     }
 
-    gtk_label_set_text (window->details->directory_contents_value_field,
+    gtk_label_set_text (window->directory_contents_value_field,
                         text);
     g_free (text);
 
@@ -2363,13 +2365,13 @@ directory_contents_value_field_update (NautilusPropertiesWindow *window)
         text = g_strconcat (temp, "\n ", NULL);
         g_free (temp);
     }
-    gtk_label_set_text (window->details->directory_contents_title_field,
+    gtk_label_set_text (window->directory_contents_title_field,
                         text);
     g_free (text);
 
     if (!deep_count_active)
     {
-        window->details->deep_count_finished = TRUE;
+        window->deep_count_finished = TRUE;
         stop_spinner (window);
     }
 }
@@ -2381,7 +2383,7 @@ update_directory_contents_callback (gpointer data)
 
     window = NAUTILUS_PROPERTIES_WINDOW (data);
 
-    window->details->update_directory_contents_timeout_id = 0;
+    window->update_directory_contents_timeout_id = 0;
     directory_contents_value_field_update (window);
 
     return FALSE;
@@ -2392,9 +2394,9 @@ schedule_directory_contents_update (NautilusPropertiesWindow *window)
 {
     g_assert (NAUTILUS_IS_PROPERTIES_WINDOW (window));
 
-    if (window->details->update_directory_contents_timeout_id == 0)
+    if (window->update_directory_contents_timeout_id == 0)
     {
-        window->details->update_directory_contents_timeout_id
+        window->update_directory_contents_timeout_id
             = g_timeout_add (DIRECTORY_CONTENTS_UPDATE_INTERVAL,
                              update_directory_contents_callback,
                              window);
@@ -2410,8 +2412,8 @@ attach_directory_contents_value_field (NautilusPropertiesWindow *window,
 
     value_field = attach_value_label (grid, sibling, "");
 
-    g_assert (window->details->directory_contents_value_field == NULL);
-    window->details->directory_contents_value_field = value_field;
+    g_assert (window->directory_contents_value_field == NULL);
+    window->directory_contents_value_field = value_field;
 
     gtk_label_set_line_wrap (value_field, TRUE);
 
@@ -2475,20 +2477,20 @@ append_directory_contents_fields (NautilusPropertiesWindow *window,
     GList *l;
 
     title_field = attach_title_field (grid, "");
-    window->details->directory_contents_title_field = title_field;
+    window->directory_contents_title_field = title_field;
     gtk_label_set_line_wrap (title_field, TRUE);
 
     value_field = attach_directory_contents_value_field (window, grid, GTK_WIDGET (title_field));
 
-    window->details->directory_contents_spinner = gtk_spinner_new ();
+    window->directory_contents_spinner = gtk_spinner_new ();
 
     gtk_grid_attach_next_to (grid,
-                             window->details->directory_contents_spinner,
+                             window->directory_contents_spinner,
                              GTK_WIDGET (value_field),
                              GTK_POS_RIGHT,
                              1, 1);
 
-    for (l = window->details->target_files; l; l = l->next)
+    for (l = window->target_files; l; l = l->next)
     {
         NautilusFile *file;
 
@@ -2658,7 +2660,7 @@ should_show_accessed_date (NautilusPropertiesWindow *window)
      * day decide that it is useful, we should separately
      * consider whether it's useful for "trash:".
      */
-    if (file_list_all_directories (window->details->target_files))
+    if (file_list_all_directories (window->target_files))
     {
         return FALSE;
     }
@@ -2685,7 +2687,7 @@ location_show_original (NautilusPropertiesWindow *window)
 
     /* there is no way a recent item will be mixed with
      *   other items so just pick the first file to check */
-    file = NAUTILUS_FILE (g_list_nth_data (window->details->original_files, 0));
+    file = NAUTILUS_FILE (g_list_nth_data (window->original_files, 0));
     return (file != NULL && !nautilus_file_is_in_recent (file));
 }
 
@@ -2701,7 +2703,7 @@ should_show_free_space (NautilusPropertiesWindow *window)
         return FALSE;
     }
 
-    if (file_list_all_directories (window->details->target_files))
+    if (file_list_all_directories (window->target_files))
     {
         return TRUE;
     }
@@ -2862,8 +2864,8 @@ paint_pie_chart (GtkWidget *widget,
 
     window = NAUTILUS_PROPERTIES_WINDOW (data);
 
-    free = (double) window->details->volume_free / (double) window->details->volume_capacity;
-    used = (double) window->details->volume_used / (double) window->details->volume_capacity;
+    free = (double) window->volume_free / (double) window->volume_capacity;
+    used = (double) window->volume_used / (double) window->volume_capacity;
     reserved = 1.0 - (used + free);
 
     paint_slice (widget, cr,
@@ -2901,9 +2903,9 @@ create_pie_widget (NautilusPropertiesWindow *window)
     GFile *location;
     GFileInfo *info;
 
-    capacity = g_format_size (window->details->volume_capacity);
-    free = g_format_size (window->details->volume_free);
-    used = g_format_size (window->details->volume_used);
+    capacity = g_format_size (window->volume_capacity);
+    free = g_format_size (window->volume_free);
+    used = g_format_size (window->volume_used);
 
     file = get_original_file (window);
 
@@ -3048,29 +3050,29 @@ create_volume_usage_widget (NautilusPropertiesWindow *window)
 
     if (info)
     {
-        window->details->volume_capacity = g_file_info_get_attribute_uint64 (info, 
G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
-        window->details->volume_free = g_file_info_get_attribute_uint64 (info, 
G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
+        window->volume_capacity = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
+        window->volume_free = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
         if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_FILESYSTEM_USED))
         {
-            window->details->volume_used = g_file_info_get_attribute_uint64 (info, 
G_FILE_ATTRIBUTE_FILESYSTEM_USED);
+            window->volume_used = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_USED);
         }
         else
         {
-            window->details->volume_used = window->details->volume_capacity - window->details->volume_free;
+            window->volume_used = window->volume_capacity - window->volume_free;
         }
 
         g_object_unref (info);
     }
     else
     {
-        window->details->volume_capacity = 0;
-        window->details->volume_free = 0;
-        window->details->volume_used = 0;
+        window->volume_capacity = 0;
+        window->volume_free = 0;
+        window->volume_used = 0;
     }
 
     g_object_unref (location);
 
-    if (window->details->volume_capacity > 0)
+    if (window->volume_capacity > 0)
     {
         piewidget = create_pie_widget (window);
         gtk_widget_show_all (piewidget);
@@ -3113,7 +3115,7 @@ create_basic_page (NautilusPropertiesWindow *window)
     GtkWidget *hbox, *vbox;
     GtkWidget *button;
 
-    hbox = create_page_with_box (window->details->notebook,
+    hbox = create_page_with_box (window->notebook,
                                  GTK_ORIENTATION_HORIZONTAL,
                                  _("Basic"),
                                  "help:gnome-help/nautilus-file-properties-basic");
@@ -3127,7 +3129,7 @@ create_basic_page (NautilusPropertiesWindow *window)
 
     gtk_box_pack_start (GTK_BOX (hbox), icon_pixmap_widget, FALSE, FALSE, 0);
 
-    window->details->icon_chooser = NULL;
+    window->icon_chooser = NULL;
 
     /* Grid */
 
@@ -3137,19 +3139,19 @@ create_basic_page (NautilusPropertiesWindow *window)
 
     grid = GTK_GRID (create_grid_with_standard_properties ());
     gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (grid), FALSE, FALSE, 0);
-    window->details->basic_grid = grid;
+    window->basic_grid = grid;
 
     /* Name label.  The text will be determined in update_name_field */
-    window->details->name_label = attach_title_field (grid, NULL);
+    window->name_label = attach_title_field (grid, NULL);
 
     /* Name field */
-    window->details->name_field = NULL;
+    window->name_field = NULL;
     update_name_field (window);
 
     /* Start with name field selected, if it's an entry. */
-    if (GTK_IS_ENTRY (window->details->name_field))
+    if (GTK_IS_ENTRY (window->name_field))
     {
-        gtk_widget_grab_focus (GTK_WIDGET (window->details->name_field));
+        gtk_widget_grab_focus (GTK_WIDGET (window->name_field));
     }
 
     if (should_show_file_type (window))
@@ -3254,7 +3256,7 @@ files_has_directory (NautilusPropertiesWindow *window)
 {
     GList *l;
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         file = NAUTILUS_FILE (l->data);
@@ -3273,7 +3275,7 @@ files_has_changable_permissions_directory (NautilusPropertiesWindow *window)
     GList *l;
     gboolean changable = FALSE;
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         file = NAUTILUS_FILE (l->data);
@@ -3298,7 +3300,7 @@ files_has_file (NautilusPropertiesWindow *window)
 {
     GList *l;
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         file = NAUTILUS_FILE (l->data);
@@ -3314,7 +3316,7 @@ files_has_file (NautilusPropertiesWindow *window)
 static void
 start_long_operation (NautilusPropertiesWindow *window)
 {
-    if (window->details->long_operation_underway == 0)
+    if (window->long_operation_underway == 0)
     {
         /* start long operation */
         GdkDisplay *display;
@@ -3325,19 +3327,19 @@ start_long_operation (NautilusPropertiesWindow *window)
         gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor);
         g_object_unref (cursor);
     }
-    window->details->long_operation_underway++;
+    window->long_operation_underway++;
 }
 
 static void
 end_long_operation (NautilusPropertiesWindow *window)
 {
     if (gtk_widget_get_window (GTK_WIDGET (window)) != NULL &&
-        window->details->long_operation_underway == 1)
+        window->long_operation_underway == 1)
     {
         /* finished !! */
         gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), NULL);
     }
-    window->details->long_operation_underway--;
+    window->long_operation_underway--;
 }
 
 static void
@@ -3368,7 +3370,7 @@ update_permissions (NautilusPropertiesWindow *window,
 {
     GList *l;
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         guint32 permissions;
@@ -3391,7 +3393,7 @@ update_permissions (NautilusPropertiesWindow *window,
         if (use_original)
         {
             gpointer ptr;
-            if (g_hash_table_lookup_extended (window->details->initial_permissions,
+            if (g_hash_table_lookup_extended (window->initial_permissions,
                                               file, NULL, &ptr))
             {
                 permissions = (permissions & ~vfs_mask) | (GPOINTER_TO_INT (ptr) & vfs_mask);
@@ -3423,7 +3425,7 @@ initial_permission_state_consistent (NautilusPropertiesWindow *window,
 
     first = TRUE;
     first_permissions = 0;
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         guint32 permissions;
@@ -3437,7 +3439,7 @@ initial_permission_state_consistent (NautilusPropertiesWindow *window,
             continue;
         }
 
-        permissions = GPOINTER_TO_INT (g_hash_table_lookup (window->details->initial_permissions,
+        permissions = GPOINTER_TO_INT (g_hash_table_lookup (window->initial_permissions,
                                                             file));
 
         if (first)
@@ -3546,7 +3548,7 @@ permission_button_update (NautilusPropertiesWindow *window,
     all_unset = TRUE;
     all_cannot_set = TRUE;
     no_match = TRUE;
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         guint32 file_permissions;
@@ -3622,8 +3624,8 @@ set_up_permissions_checkbox (NautilusPropertiesWindow *window,
     g_object_set_data (G_OBJECT (check_button), "is-folder",
                        GINT_TO_POINTER (is_folder));
 
-    window->details->permission_buttons =
-        g_list_prepend (window->details->permission_buttons,
+    window->permission_buttons =
+        g_list_prepend (window->permission_buttons,
                         check_button);
 
     g_signal_connect_object (check_button, "toggled",
@@ -3871,7 +3873,7 @@ permission_combo_update (NautilusPropertiesWindow *window,
     all_dir_cannot_set = TRUE;
     all_file_cannot_set = TRUE;
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         guint32 file_permissions;
@@ -4155,7 +4157,7 @@ add_permissions_combo_box (NautilusPropertiesWindow *window,
 
     combo = create_permissions_combo_box (type, is_folder);
 
-    window->details->permission_combos = g_list_prepend (window->details->permission_combos,
+    window->permission_combos = g_list_prepend (window->permission_combos,
                                                          combo);
 
     g_signal_connect (combo, "changed", G_CALLBACK (permission_combo_changed), window);
@@ -4384,7 +4386,7 @@ on_change_permissions_response (GtkDialog                *dialog,
     dir_permission_mask = 0;
 
     /* Simple mode, minus exec checkbox */
-    for (l = window->details->change_permission_combos; l != NULL; l = l->next)
+    for (l = window->change_permission_combos; l != NULL; l = l->next)
     {
         combo = l->data;
 
@@ -4428,7 +4430,7 @@ on_change_permissions_response (GtkDialog                *dialog,
         }
     }
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         char *uri;
@@ -4583,12 +4585,12 @@ on_change_permissions_clicked (GtkWidget                *button,
     gtk_label_set_xalign (GTK_LABEL (label), 0);
     gtk_grid_attach (grid, label, 0, 1, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_USER, FALSE);
-    window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
+    window->change_permission_combos = g_list_prepend (window->change_permission_combos,
                                                                 combo);
     set_active_from_umask (combo, PERMISSION_USER, FALSE);
     gtk_grid_attach (grid, combo, 1, 1, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_USER, TRUE);
-    window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
+    window->change_permission_combos = g_list_prepend (window->change_permission_combos,
                                                                 combo);
     set_active_from_umask (combo, PERMISSION_USER, TRUE);
     gtk_grid_attach (grid, combo, 2, 1, 1, 1);
@@ -4597,12 +4599,12 @@ on_change_permissions_clicked (GtkWidget                *button,
     gtk_label_set_xalign (GTK_LABEL (label), 0);
     gtk_grid_attach (grid, label, 0, 2, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_GROUP, FALSE);
-    window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
+    window->change_permission_combos = g_list_prepend (window->change_permission_combos,
                                                                 combo);
     set_active_from_umask (combo, PERMISSION_GROUP, FALSE);
     gtk_grid_attach (grid, combo, 1, 2, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_GROUP, TRUE);
-    window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
+    window->change_permission_combos = g_list_prepend (window->change_permission_combos,
                                                                 combo);
     set_active_from_umask (combo, PERMISSION_GROUP, TRUE);
     gtk_grid_attach (grid, combo, 2, 2, 1, 1);
@@ -4611,12 +4613,12 @@ on_change_permissions_clicked (GtkWidget                *button,
     gtk_label_set_xalign (GTK_LABEL (label), 0);
     gtk_grid_attach (grid, label, 0, 3, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_OTHER, FALSE);
-    window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
+    window->change_permission_combos = g_list_prepend (window->change_permission_combos,
                                                                 combo);
     set_active_from_umask (combo, PERMISSION_OTHER, FALSE);
     gtk_grid_attach (grid, combo, 1, 3, 1, 1);
     combo = create_permissions_combo_box (PERMISSION_OTHER, TRUE);
-    window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos,
+    window->change_permission_combos = g_list_prepend (window->change_permission_combos,
                                                                 combo);
     set_active_from_umask (combo, PERMISSION_OTHER, TRUE);
     gtk_grid_attach (grid, combo, 2, 3, 1, 1);
@@ -4633,19 +4635,19 @@ create_permissions_page (NautilusPropertiesWindow *window)
     char *file_name, *prompt_text;
     GList *file_list;
 
-    vbox = create_page_with_box (window->details->notebook,
+    vbox = create_page_with_box (window->notebook,
                                  GTK_ORIENTATION_VERTICAL,
                                  _("Permissions"),
                                  "help:gnome-help/nautilus-file-properties-permissions");
 
-    file_list = window->details->original_files;
+    file_list = window->original_files;
 
-    window->details->initial_permissions = NULL;
+    window->initial_permissions = NULL;
 
-    if (all_can_get_permissions (file_list) && all_can_get_permissions (window->details->target_files))
+    if (all_can_get_permissions (file_list) && all_can_get_permissions (window->target_files))
     {
-        window->details->initial_permissions = get_initial_permissions (window->details->target_files);
-        window->details->has_recursive_apply = files_has_changable_permissions_directory (window);
+        window->initial_permissions = get_initial_permissions (window->target_files);
+        window->has_recursive_apply = files_has_changable_permissions_directory (window);
 
         if (!all_can_set_permissions (file_list))
         {
@@ -4673,7 +4675,7 @@ create_permissions_page (NautilusPropertiesWindow *window)
 
         append_blank_row (page_grid);
 
-        if (window->details->has_recursive_apply)
+        if (window->has_recursive_apply)
         {
             hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
             gtk_widget_show (hbox);
@@ -4725,7 +4727,7 @@ append_extension_pages (NautilusPropertiesWindow *window)
         provider = NAUTILUS_PROPERTY_PAGE_PROVIDER (p->data);
 
         pages = nautilus_property_page_provider_get_pages
-                    (provider, window->details->original_files);
+                    (provider, window->original_files);
 
         for (l = pages; l != NULL; l = l->next)
         {
@@ -4739,9 +4741,9 @@ append_extension_pages (NautilusPropertiesWindow *window)
                           "page", &page_widget, "label", &label,
                           NULL);
 
-            gtk_notebook_append_page (window->details->notebook,
+            gtk_notebook_append_page (window->notebook,
                                       page_widget, label);
-            gtk_container_child_set (GTK_CONTAINER (window->details->notebook),
+            gtk_container_child_set (GTK_CONTAINER (window->notebook),
                                      page_widget,
                                      "tab-expand", TRUE,
                                      NULL);
@@ -4858,10 +4860,10 @@ file_changed_callback (NautilusFile *file,
 {
     NautilusPropertiesWindow *window = NAUTILUS_PROPERTIES_WINDOW (user_data);
 
-    if (!g_list_find (window->details->changed_files, file))
+    if (!g_list_find (window->changed_files, file))
     {
         nautilus_file_ref (file);
-        window->details->changed_files = g_list_prepend (window->details->changed_files, file);
+        window->changed_files = g_list_prepend (window->changed_files, file);
         schedule_files_update (window);
     }
 }
@@ -4896,13 +4898,13 @@ should_show_open_with (NautilusPropertiesWindow *window)
     {
         GList *l;
 
-        if (!file_list_attributes_identical (window->details->target_files,
+        if (!file_list_attributes_identical (window->target_files,
                                              "mime_type"))
         {
             return FALSE;
         }
 
-        for (l = window->details->target_files; l; l = l->next)
+        for (l = window->target_files; l; l = l->next)
         {
             file = NAUTILUS_FILE (l->data);
             app_info = nautilus_mime_get_default_application_for_file (file);
@@ -4914,7 +4916,7 @@ should_show_open_with (NautilusPropertiesWindow *window)
 
         /* since we just confirmed all the mime types are the
          *  same we only need to test one file */
-        file = window->details->target_files->data;
+        file = window->target_files->data;
     }
     else
     {
@@ -4953,7 +4955,7 @@ create_open_with_page (NautilusPropertiesWindow *window)
     }
     else
     {
-        files = g_list_copy (window->details->original_files);
+        files = g_list_copy (window->original_files);
         if (files == NULL)
         {
             return;
@@ -4967,9 +4969,9 @@ create_open_with_page (NautilusPropertiesWindow *window)
     g_list_free (files);
 
     g_object_set_data_full (G_OBJECT (vbox), "help-uri", g_strdup ("help:gnome-help/files-open"), g_free);
-    gtk_notebook_append_page (window->details->notebook,
+    gtk_notebook_append_page (window->notebook,
                               vbox, gtk_label_new (_("Open With")));
-    gtk_container_child_set (GTK_CONTAINER (window->details->notebook),
+    gtk_container_child_set (GTK_CONTAINER (window->notebook),
                              vbox,
                              "tab-expand", TRUE,
                              NULL);
@@ -4988,9 +4990,9 @@ create_properties_window (StartupData *startup_data)
                                                          "modal", TRUE,
                                                          NULL));
 
-    window->details->original_files = nautilus_file_list_copy (startup_data->original_files);
+    window->original_files = nautilus_file_list_copy (startup_data->original_files);
 
-    window->details->target_files = nautilus_file_list_copy (startup_data->target_files);
+    window->target_files = nautilus_file_list_copy (startup_data->target_files);
 
     gtk_window_set_wmclass (GTK_WINDOW (window), "file_properties", "Nautilus");
 
@@ -5018,7 +5020,7 @@ create_properties_window (StartupData *startup_data)
      * target files.
      */
 
-    for (l = window->details->original_files; l != NULL; l = l->next)
+    for (l = window->original_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         NautilusFileAttributes attributes;
@@ -5030,11 +5032,11 @@ create_properties_window (StartupData *startup_data)
             NAUTILUS_FILE_ATTRIBUTE_INFO;
 
         nautilus_file_monitor_add (file,
-                                   &window->details->original_files,
+                                   &window->original_files,
                                    attributes);
     }
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         NautilusFile *file;
         NautilusFileAttributes attributes;
@@ -5048,10 +5050,10 @@ create_properties_window (StartupData *startup_data)
         }
 
         attributes |= NAUTILUS_FILE_ATTRIBUTE_INFO;
-        nautilus_file_monitor_add (file, &window->details->target_files, attributes);
+        nautilus_file_monitor_add (file, &window->target_files, attributes);
     }
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
         g_signal_connect_object (NAUTILUS_FILE (l->data),
                                  "changed",
@@ -5060,7 +5062,7 @@ create_properties_window (StartupData *startup_data)
                                  0);
     }
 
-    for (l = window->details->original_files; l != NULL; l = l->next)
+    for (l = window->original_files; l != NULL; l = l->next)
     {
         g_signal_connect_object (NAUTILUS_FILE (l->data),
                                  "changed",
@@ -5070,12 +5072,12 @@ create_properties_window (StartupData *startup_data)
     }
 
     /* Create the notebook tabs. */
-    window->details->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
-    gtk_notebook_set_show_border (window->details->notebook, FALSE);
+    window->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
+    gtk_notebook_set_show_border (window->notebook, FALSE);
     gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), 0);
-    gtk_widget_show (GTK_WIDGET (window->details->notebook));
+    gtk_widget_show (GTK_WIDGET (window->notebook));
     gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
-                        GTK_WIDGET (window->details->notebook),
+                        GTK_WIDGET (window->notebook),
                         TRUE, TRUE, 0);
 
     /* Create the pages. */
@@ -5375,63 +5377,63 @@ real_destroy (GtkWidget *object)
     unschedule_or_cancel_group_change (window);
     unschedule_or_cancel_owner_change (window);
 
-    for (l = window->details->original_files; l != NULL; l = l->next)
+    for (l = window->original_files; l != NULL; l = l->next)
     {
-        nautilus_file_monitor_remove (NAUTILUS_FILE (l->data), &window->details->original_files);
+        nautilus_file_monitor_remove (NAUTILUS_FILE (l->data), &window->original_files);
     }
-    nautilus_file_list_free (window->details->original_files);
-    window->details->original_files = NULL;
+    nautilus_file_list_free (window->original_files);
+    window->original_files = NULL;
 
-    for (l = window->details->target_files; l != NULL; l = l->next)
+    for (l = window->target_files; l != NULL; l = l->next)
     {
-        nautilus_file_monitor_remove (NAUTILUS_FILE (l->data), &window->details->target_files);
+        nautilus_file_monitor_remove (NAUTILUS_FILE (l->data), &window->target_files);
     }
-    nautilus_file_list_free (window->details->target_files);
-    window->details->target_files = NULL;
+    nautilus_file_list_free (window->target_files);
+    window->target_files = NULL;
 
-    nautilus_file_list_free (window->details->changed_files);
-    window->details->changed_files = NULL;
+    nautilus_file_list_free (window->changed_files);
+    window->changed_files = NULL;
 
-    if (window->details->deep_count_spinner_timeout_id > 0)
+    if (window->deep_count_spinner_timeout_id > 0)
     {
-        g_source_remove (window->details->deep_count_spinner_timeout_id);
+        g_source_remove (window->deep_count_spinner_timeout_id);
     }
 
-    while (window->details->deep_count_files)
+    while (window->deep_count_files)
     {
-        stop_deep_count_for_file (window, window->details->deep_count_files->data);
+        stop_deep_count_for_file (window, window->deep_count_files->data);
     }
 
-    window->details->name_field = NULL;
+    window->name_field = NULL;
 
-    g_list_free (window->details->permission_buttons);
-    window->details->permission_buttons = NULL;
+    g_list_free (window->permission_buttons);
+    window->permission_buttons = NULL;
 
-    g_list_free (window->details->permission_combos);
-    window->details->permission_combos = NULL;
+    g_list_free (window->permission_combos);
+    window->permission_combos = NULL;
 
-    g_list_free (window->details->change_permission_combos);
-    window->details->change_permission_combos = NULL;
+    g_list_free (window->change_permission_combos);
+    window->change_permission_combos = NULL;
 
-    if (window->details->initial_permissions)
+    if (window->initial_permissions)
     {
-        g_hash_table_destroy (window->details->initial_permissions);
-        window->details->initial_permissions = NULL;
+        g_hash_table_destroy (window->initial_permissions);
+        window->initial_permissions = NULL;
     }
 
-    g_list_free (window->details->value_fields);
-    window->details->value_fields = NULL;
+    g_list_free (window->value_fields);
+    window->value_fields = NULL;
 
-    if (window->details->update_directory_contents_timeout_id != 0)
+    if (window->update_directory_contents_timeout_id != 0)
     {
-        g_source_remove (window->details->update_directory_contents_timeout_id);
-        window->details->update_directory_contents_timeout_id = 0;
+        g_source_remove (window->update_directory_contents_timeout_id);
+        window->update_directory_contents_timeout_id = 0;
     }
 
-    if (window->details->update_files_timeout_id != 0)
+    if (window->update_files_timeout_id != 0)
     {
-        g_source_remove (window->details->update_files_timeout_id);
-        window->details->update_files_timeout_id = 0;
+        g_source_remove (window->update_files_timeout_id);
+        window->update_files_timeout_id = 0;
     }
 
     GTK_WIDGET_CLASS (nautilus_properties_window_parent_class)->destroy (object);
@@ -5444,13 +5446,13 @@ real_finalize (GObject *object)
 
     window = NAUTILUS_PROPERTIES_WINDOW (object);
 
-    g_list_free_full (window->details->mime_list, g_free);
+    g_list_free_full (window->mime_list, g_free);
 
-    g_free (window->details->pending_name);
+    g_free (window->pending_name);
 
-    if (window->details->select_idle_id != 0)
+    if (window->select_idle_id != 0)
     {
-        g_source_remove (window->details->select_idle_id);
+        g_source_remove (window->select_idle_id);
     }
 
     G_OBJECT_CLASS (nautilus_properties_window_parent_class)->finalize (object);
@@ -5474,7 +5476,7 @@ set_icon (const char               *icon_uri,
     {
         GList *l;
 
-        for (l = properties_window->details->original_files; l != NULL; l = l->next)
+        for (l = properties_window->original_files; l != NULL; l = l->next)
         {
             g_autoptr (GFile) file_location = NULL;
             g_autoptr (GFile) icon_location = NULL;
@@ -5606,7 +5608,7 @@ select_image_button_callback (GtkWidget                *widget,
 
     g_assert (NAUTILUS_IS_PROPERTIES_WINDOW (window));
 
-    dialog = window->details->icon_chooser;
+    dialog = window->icon_chooser;
 
     if (dialog == NULL)
     {
@@ -5635,16 +5637,16 @@ select_image_button_callback (GtkWidget                *widget,
         g_signal_connect (dialog, "update-preview",
                           G_CALLBACK (update_preview_callback), window);
 
-        window->details->icon_chooser = dialog;
+        window->icon_chooser = dialog;
 
         g_object_add_weak_pointer (G_OBJECT (dialog),
-                                   (gpointer *) &window->details->icon_chooser);
+                                   (gpointer *) &window->icon_chooser);
     }
 
     /* it's likely that the user wants to pick an icon that is inside a local directory */
-    if (g_list_length (window->details->original_files) == 1)
+    if (g_list_length (window->original_files) == 1)
     {
-        file = NAUTILUS_FILE (window->details->original_files->data);
+        file = NAUTILUS_FILE (window->original_files->data);
 
         if (nautilus_file_is_directory (file))
         {
@@ -5662,7 +5664,7 @@ select_image_button_callback (GtkWidget                *widget,
     }
 
     revert_is_sensitive = FALSE;
-    for (l = window->details->original_files; l != NULL; l = l->next)
+    for (l = window->original_files; l != NULL; l = l->next)
     {
         file = NAUTILUS_FILE (l->data);
         image_path = nautilus_file_get_metadata (file, NAUTILUS_METADATA_KEY_CUSTOM_ICON, NULL);
@@ -5693,13 +5695,9 @@ nautilus_properties_window_class_init (NautilusPropertiesWindowClass *class)
     binding_set = gtk_binding_set_by_class (class);
     gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
                                   "close", 0);
-
-    g_type_class_add_private (class, sizeof (NautilusPropertiesWindowDetails));
 }
 
 static void
 nautilus_properties_window_init (NautilusPropertiesWindow *window)
 {
-    window->details = G_TYPE_INSTANCE_GET_PRIVATE (window, NAUTILUS_TYPE_PROPERTIES_WINDOW,
-                                                   NautilusPropertiesWindowDetails);
 }
diff --git a/src/nautilus-properties-window.h b/src/nautilus-properties-window.h
index 5fac0ff50..d110bc245 100644
--- a/src/nautilus-properties-window.h
+++ b/src/nautilus-properties-window.h
@@ -24,40 +24,13 @@
 #pragma once
 
 #include <gtk/gtk.h>
-#include "nautilus-file.h"
-
-typedef struct NautilusPropertiesWindow NautilusPropertiesWindow;
-
-#define NAUTILUS_TYPE_PROPERTIES_WINDOW nautilus_properties_window_get_type()
-#define NAUTILUS_PROPERTIES_WINDOW(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_PROPERTIES_WINDOW, NautilusPropertiesWindow))
-#define NAUTILUS_PROPERTIES_WINDOW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_PROPERTIES_WINDOW, NautilusPropertiesWindowClass))
-#define NAUTILUS_IS_PROPERTIES_WINDOW(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_PROPERTIES_WINDOW))
-#define NAUTILUS_IS_PROPERTIES_WINDOW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_PROPERTIES_WINDOW))
-#define NAUTILUS_PROPERTIES_WINDOW_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_PROPERTIES_WINDOW, NautilusPropertiesWindowClass))
-
-typedef struct NautilusPropertiesWindowDetails NautilusPropertiesWindowDetails;
-
-struct NautilusPropertiesWindow {
-       GtkDialog window;
-       NautilusPropertiesWindowDetails *details;       
-};
-
-struct NautilusPropertiesWindowClass {
-       GtkDialogClass parent_class;
-       
-       /* Keybinding signals */
-       void (* close)    (NautilusPropertiesWindow *window);
-};
-
-typedef struct NautilusPropertiesWindowClass NautilusPropertiesWindowClass;
-
-GType   nautilus_properties_window_get_type   (void);
-
-void   nautilus_properties_window_present    (GList       *files,
-                                              GtkWidget   *parent_widget,
-                                              const gchar *startup_id);
\ No newline at end of file
+
+#define NAUTILUS_TYPE_PROPERTIES_WINDOW (nautilus_properties_window_get_type ())
+
+G_DECLARE_FINAL_TYPE (NautilusPropertiesWindow, nautilus_properties_window,
+                      NAUTILUS, PROPERTIES_WINDOW,
+                      GtkDialog)
+
+void nautilus_properties_window_present (GList       *files,
+                                         GtkWidget   *parent_widget,
+                                         const gchar *startup_id);