[gedit/zbrown/deteplification-src: 392/633] Window: *_default_location() -> *_file_chooser_folder_uri()

[Zander Brown <zbrown src gnome org>]

commit 2d75001ff3b7e3b1ae69125f91e0681cd62867c1
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Jun 7 02:18:16 2020 +0200

    Window: *_default_location() -> *_file_chooser_folder_uri()

 gedit/gedit-commands-file.c | 41 +++++++++++++++++++----------------------
 gedit/gedit-window.c        | 23 ++++++-----------------
 gedit/gedit-window.h        |  8 +++++---
 3 files changed, 30 insertions(+), 42 deletions(-)
---
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index ecfa4002e..0318faba0 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -367,7 +367,6 @@ file_chooser_open_done_cb (GeditFileChooserOpen *file_chooser,
        GSList *files;
        const GtkSourceEncoding *encoding;
        gchar *folder_uri;
-       GFile *folder = NULL;
        GSList *loaded_documents;
 
        gedit_debug (DEBUG_COMMANDS);
@@ -392,13 +391,8 @@ file_chooser_open_done_cb (GeditFileChooserOpen *file_chooser,
        }
 
        /* Remember the folder we navigated to. */
-       if (folder_uri != NULL)
-       {
-               folder = g_file_new_for_uri (folder_uri);
-               g_free (folder_uri);
-       }
-       _gedit_window_set_default_location (window, folder);
-       g_clear_object (&folder);
+       _gedit_window_set_file_chooser_folder_uri (window, folder_uri);
+       g_free (folder_uri);
 
        loaded_documents = gedit_commands_load_locations (window, files, encoding, 0, 0);
 
@@ -425,21 +419,14 @@ _gedit_cmd_file_open (GSimpleAction *action,
 
        if (window != NULL)
        {
-               GFile *default_folder = NULL;
+               const gchar *folder_uri;
 
                _gedit_file_chooser_open_set_transient_for (file_chooser, GTK_WINDOW (window));
 
-               /* Set the current folder */
-               default_folder = _gedit_window_get_default_location (window);
-               if (default_folder != NULL)
+               folder_uri = _gedit_window_get_file_chooser_folder_uri (window);
+               if (folder_uri != NULL)
                {
-                       gchar *default_folder_uri;
-
-                       default_folder_uri = g_file_get_uri (default_folder);
-                       _gedit_file_chooser_open_set_current_folder_uri (file_chooser, default_folder_uri);
-
-                       g_object_unref (default_folder);
-                       g_free (default_folder_uri);
+                       _gedit_file_chooser_open_set_current_folder_uri (file_chooser, folder_uri);
                }
        }
 
@@ -700,8 +687,13 @@ save_dialog_response_cb (GeditFileChooserDialog *dialog,
                folder = g_file_get_parent (location);
                if (folder != NULL)
                {
-                       _gedit_window_set_default_location (window, folder);
+                       gchar *folder_uri;
+
+                       folder_uri = g_file_get_uri (folder);
+                       _gedit_window_set_file_chooser_folder_uri (window, folder_uri);
+
                        g_object_unref (folder);
+                       g_free (folder_uri);
                }
        }
 
@@ -828,11 +820,16 @@ save_as_tab_async (GeditTab            *tab,
        }
        else
        {
+               const gchar *default_folder_uri;
                GFile *default_folder;
                gchar *docname;
 
-               default_folder = _gedit_window_get_default_location (window);
-               if (default_folder == NULL)
+               default_folder_uri = _gedit_window_get_file_chooser_folder_uri (window);
+               if (default_folder_uri != NULL)
+               {
+                       default_folder = g_file_new_for_uri (default_folder_uri);
+               }
+               else
                {
                        /* It's logical to take the home dir by default, and it fixes
                         * a problem on MS Windows (hang in C:\windows\system32).
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index c08c0afcb..ef41b1fc0 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -3429,33 +3429,22 @@ gedit_window_get_state (GeditWindow *window)
        return window->priv->state;
 }
 
-GFile *
-_gedit_window_get_default_location (GeditWindow *window)
+const gchar *
+_gedit_window_get_file_chooser_folder_uri (GeditWindow *window)
 {
        g_return_val_if_fail (GEDIT_IS_WINDOW (window), NULL);
 
-       if (window->priv->file_chooser_folder_uri == NULL)
-       {
-               return NULL;
-       }
-
-       return g_file_new_for_uri (window->priv->file_chooser_folder_uri);
+       return window->priv->file_chooser_folder_uri;
 }
 
 void
-_gedit_window_set_default_location (GeditWindow *window,
-                                   GFile       *folder)
+_gedit_window_set_file_chooser_folder_uri (GeditWindow *window,
+                                          const gchar *folder_uri)
 {
        g_return_if_fail (GEDIT_IS_WINDOW (window));
-       g_return_if_fail (folder == NULL || G_IS_FILE (folder));
 
        g_free (window->priv->file_chooser_folder_uri);
-       window->priv->file_chooser_folder_uri = NULL;
-
-       if (folder != NULL)
-       {
-               window->priv->file_chooser_folder_uri = g_file_get_uri (folder);
-       }
+       window->priv->file_chooser_folder_uri = g_strdup (folder_uri);
 }
 
 static void
diff --git a/gedit/gedit-window.h b/gedit/gedit-window.h
index b2eb53535..4a05992cf 100644
--- a/gedit/gedit-window.h
+++ b/gedit/gedit-window.h
@@ -152,10 +152,12 @@ void             _gedit_window_move_tab_to_new_tab_group(GeditWindow         *wi
                                                          GeditTab            *tab);
 gboolean        _gedit_window_is_removing_tabs         (GeditWindow         *window);
 
-GFile          *_gedit_window_get_default_location     (GeditWindow         *window);
+const gchar    *_gedit_window_get_file_chooser_folder_uri
+                                                       (GeditWindow         *window);
 
-void            _gedit_window_set_default_location     (GeditWindow         *window,
-                                                        GFile               *folder);
+void            _gedit_window_set_file_chooser_folder_uri
+                                                       (GeditWindow         *window,
+                                                        const gchar         *folder_uri);
 
 void            _gedit_window_fullscreen               (GeditWindow         *window);