[nautilus/wip/corey/properties: 33/36] properties: Remove code for opening existing window




commit de36ec203124cb64b46e52aa276254ae0aeed49d
Author: Corey Berla <corey berla me>
Date:   Tue Aug 23 10:23:20 2022 -0700

    properties: Remove code for opening existing window
    
    Apparently this was from when Nautilus had properties windows as
    independent windows.  Now it breaks the ability to open the same
    property window from another Nautilus window.  Remove the code.
    
    Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/2358

 src/nautilus-properties-window.c | 71 ----------------------------------------
 1 file changed, 71 deletions(-)
---
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 3343fa4eb..1e03b4bda 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -53,7 +53,6 @@
 #include "nautilus-tag-manager.h"
 #include "nautilus-ui-utilities.h"
 
-static GHashTable *windows;
 static GHashTable *pending_lists;
 
 typedef struct
@@ -3930,42 +3929,6 @@ get_target_file_list (GList *original_files)
                              NULL);
 }
 
-static void
-add_window (NautilusPropertiesWindow *self)
-{
-    if (!is_multi_file_window (self))
-    {
-        g_hash_table_insert (windows,
-                             get_original_file (self),
-                             self);
-        g_object_set_data (G_OBJECT (self), "window_key",
-                           get_original_file (self));
-    }
-}
-
-static void
-remove_window (NautilusPropertiesWindow *self)
-{
-    gpointer key;
-
-    key = g_object_get_data (G_OBJECT (self), "window_key");
-    if (key)
-    {
-        g_hash_table_remove (windows, key);
-    }
-}
-
-static NautilusPropertiesWindow *
-get_existing_window (GList *file_list)
-{
-    if (!file_list->next)
-    {
-        return g_hash_table_lookup (windows, file_list->data);
-    }
-
-    return NULL;
-}
-
 static void
 properties_window_finish (StartupData *data)
 {
@@ -4074,7 +4037,6 @@ is_directory_ready_callback (NautilusFile *file,
 
         new_window = create_properties_window (startup_data);
 
-        add_window (new_window);
         startup_data->window = new_window;
 
         remove_pending (startup_data, FALSE, TRUE);
@@ -4099,47 +4061,16 @@ nautilus_properties_window_present (GList                            *original_f
     GtkWindow *parent_window;
     StartupData *startup_data;
     g_autolist (NautilusFile) target_files = NULL;
-    NautilusPropertiesWindow *existing_window;
     g_autofree char *pending_key = NULL;
 
     g_return_if_fail (original_files != NULL);
     g_return_if_fail (parent_widget == NULL || GTK_IS_WIDGET (parent_widget));
 
-
-    /* Create the hash tables first time through. */
-    if (windows == NULL)
-    {
-        windows = g_hash_table_new (NULL, NULL);
-    }
-
     if (pending_lists == NULL)
     {
         pending_lists = g_hash_table_new (g_str_hash, g_str_equal);
     }
 
-    /* Look to see if there's already a window for this file. */
-    existing_window = get_existing_window (original_files);
-    if (existing_window != NULL)
-    {
-        if (parent_widget)
-        {
-            gtk_window_set_display (GTK_WINDOW (existing_window),
-                                    gtk_widget_get_display (parent_widget));
-        }
-        else if (startup_id)
-        {
-            gtk_window_set_startup_id (GTK_WINDOW (existing_window), startup_id);
-        }
-
-        gtk_window_present (GTK_WINDOW (existing_window));
-        startup_data = startup_data_new (NULL, NULL, NULL, NULL, NULL, NULL,
-                                         callback, callback_data, existing_window);
-        g_signal_connect (GTK_WIDGET (existing_window), "destroy",
-                          G_CALLBACK (widget_on_destroy), startup_data);
-        return;
-    }
-
-
     pending_key = get_pending_key (original_files);
 
     /* Look to see if we're already waiting for a window for this file. */
@@ -4207,8 +4138,6 @@ real_dispose (GObject *object)
 
     self = NAUTILUS_PROPERTIES_WINDOW (object);
 
-    remove_window (self);
-
     unschedule_or_cancel_group_change (self);
     unschedule_or_cancel_owner_change (self);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]