general: Replace gtk_entry_get_text()wip/ernestask/gtk4-continued

Now the GtkEditable API should be used for that.

8 files changed, 101 insertions, 26 deletions

diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c
index a5ecf5746..15a57fa5d 100644
--- a/src/nautilus-batch-rename-dialog.c
+++ b/src/nautilus-batch-rename-dialog.c
@@ -425,6 +425,8 @@ split_entry_text (NautilusBatchRenameDialog *self,
 static GList *
 batch_rename_dialog_get_new_names (NautilusBatchRenameDialog *dialog)
 {
+    GtkEditable *editable;
+    const char *text;
     GList *result = NULL;
     GList *selection;
     GList *text_chunks;
@@ -436,14 +438,20 @@ batch_rename_dialog_get_new_names (NautilusBatchRenameDialog *dialog)
 
     if (dialog->mode == NAUTILUS_BATCH_RENAME_DIALOG_REPLACE)
     {
-        entry_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->find_entry)));
+        editable = GTK_EDITABLE (dialog->find_entry);
+        text = gtk_editable_get_text (editable);
+        entry_text = g_strdup (text);
     }
     else
     {
-        entry_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->name_entry)));
+        editable = GTK_EDITABLE (dialog->name_entry);
+        text = gtk_editable_get_text (editable);
+        entry_text = g_strdup (text);
     }
 
-    replace_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->replace_entry)));
+    editable = GTK_EDITABLE (dialog->replace_entry);
+    text = gtk_editable_get_text (editable);
+    replace_text = g_strdup (text);
 
     if (dialog->mode == NAUTILUS_BATCH_RENAME_DIALOG_REPLACE)
     {
@@ -956,8 +964,12 @@ update_listbox (NautilusBatchRenameDialog *dialog)
         }
         else
         {
-            new_name = batch_rename_replace_label_text (old_name,
-                                                        gtk_entry_get_text (GTK_ENTRY (dialog->find_entry)));
+            GtkEditable *editable;
+            const char *text;
+
+            editable = GTK_EDITABLE (dialog->find_entry);
+            text = gtk_editable_get_text (editable);
+            new_name = batch_rename_replace_label_text (old_name, text);
             gtk_label_set_markup (GTK_LABEL (label), new_name->str);
 
             g_string_free (new_name, TRUE);
@@ -1353,11 +1365,17 @@ have_unallowed_character (NautilusBatchRenameDialog *dialog)
 
     if (dialog->mode == NAUTILUS_BATCH_RENAME_DIALOG_FORMAT)
     {
-        entry_text = gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
+        GtkEditable *editable;
+
+        editable = GTK_EDITABLE (dialog->name_entry);
+        entry_text = gtk_editable_get_text (editable);
     }
     else
     {
-        entry_text = gtk_entry_get_text (GTK_ENTRY (dialog->replace_entry));
+        GtkEditable *editable;
+
+        editable = GTK_EDITABLE (dialog->replace_entry);
+        entry_text = gtk_editable_get_text (editable);
     }
 
     if (strstr (entry_text, "/") != NULL)
diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c
index d63d2377f..56a877382 100644
--- a/src/nautilus-file-conflict-dialog.c
+++ b/src/nautilus-file-conflict-dialog.c
@@ -174,11 +174,15 @@ static void
 entry_text_changed_cb (GtkEditable                *entry,
                        NautilusFileConflictDialog *dialog)
 {
+    const char *text;
+
+    text = gtk_editable_get_text (entry);
+
     /* The rename button is visible only if there's text
      * in the entry.
      */
-    if  (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), "") != 0 &&
-         g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), dialog->conflict_name) != 0)
+    if  (g_strcmp0 (text, "") != 0 &&
+         g_strcmp0 (text, dialog->conflict_name) != 0)
     {
         gtk_widget_hide (dialog->replace_button);
         gtk_widget_show (dialog->rename_button);
@@ -206,7 +210,13 @@ expander_activated_cb (GtkExpander                *w,
 
     if (!gtk_expander_get_expanded (w))
     {
-        if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (dialog->entry)), dialog->conflict_name) == 0)
+        GtkEditable *editable;
+        const char *text;
+
+        editable = GTK_EDITABLE (dialog->entry);
+        text = gtk_editable_get_text (editable);
+
+        if (g_strcmp0 (text, dialog->conflict_name) == 0)
         {
             gtk_widget_grab_focus (dialog->entry);
 
@@ -220,12 +230,18 @@ static void
 checkbox_toggled_cb (GtkToggleButton            *t,
                      NautilusFileConflictDialog *dialog)
 {
+    GtkEditable *editable;
+    const char *text;
+
+    editable = GTK_EDITABLE (dialog->entry);
+    text = gtk_editable_get_text (editable);
+
     gtk_widget_set_sensitive (dialog->expander, !gtk_toggle_button_get_active (t));
     gtk_widget_set_sensitive (dialog->rename_button, !gtk_toggle_button_get_active (t));
 
     if  (!gtk_toggle_button_get_active (t) &&
-         g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (dialog->entry)), "") != 0 &&
-         g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (dialog->entry)), dialog->conflict_name) != 0)
+         g_strcmp0 (text, "") != 0 &&
+         g_strcmp0 (text, dialog->conflict_name) != 0)
     {
         gtk_widget_hide (dialog->replace_button);
         gtk_widget_show (dialog->rename_button);
@@ -371,7 +387,15 @@ nautilus_file_conflict_dialog_class_init (NautilusFileConflictDialogClass *klass
 char *
 nautilus_file_conflict_dialog_get_new_name (NautilusFileConflictDialog *dialog)
 {
-    return g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->entry)));
+    GtkEditable *editable;
+    const char *text;
+
+    g_return_val_if_fail (NAUTILUS_IS_FILE_CONFLICT_DIALOG (dialog), NULL);
+
+    editable = GTK_EDITABLE (dialog->entry);
+    text = gtk_editable_get_text (editable)
+
+    return g_strdup (text);
 }
 
 gboolean
diff --git a/src/nautilus-file-name-widget-controller.c b/src/nautilus-file-name-widget-controller.c
index dfcdfbe7c..410ed2651 100644
--- a/src/nautilus-file-name-widget-controller.c
+++ b/src/nautilus-file-name-widget-controller.c
@@ -119,10 +119,15 @@ static gchar *
 real_get_new_name (NautilusFileNameWidgetController *self)
 {
     NautilusFileNameWidgetControllerPrivate *priv;
+    GtkEditable *editable;
+    const char *text;
 
     priv = nautilus_file_name_widget_controller_get_instance_private (self);
+    editable = GTK_EDITABLE (priv->name_entry);
+    text = gtk_editable_get_text (editable);
+    text = g_strdup (text);
 
-    return g_strstrip (g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->name_entry))));
+    return g_strstrip (text);
 }
 
 static gboolean
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 6cbd3de1e..2afbc5576 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -1662,10 +1662,14 @@ pattern_select_response_cb (GtkWidget *dialog,
     {
         case GTK_RESPONSE_OK:
         {
+            GtkEditable *editable;
+            const char *text;
+
             entry = g_object_get_data (G_OBJECT (dialog), "entry");
+            editable = GTK_EDITABLE (entry);
+            text = gtk_editable_get_text (editable);
             directory = nautilus_files_view_get_model (view);
-            selection = nautilus_directory_match_pattern (directory,
-                                                          gtk_entry_get_text (GTK_ENTRY (entry)));
+            selection = nautilus_directory_match_pattern (directory, text);
 
             if (selection)
             {
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index 8701cd977..6865e3f44 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -133,6 +133,7 @@ nautilus_location_entry_set_secondary_action (NautilusLocationEntry       *self,
 static void
 nautilus_location_entry_update_action (NautilusLocationEntry *self)
 {
+    GtkEditable *editable;
     const char *current_text;
     g_autoptr (GFile) location = NULL;
 
@@ -143,7 +144,8 @@ nautilus_location_entry_update_action (NautilusLocationEntry *self)
         return;
     }
 
-    current_text = gtk_entry_get_text (GTK_ENTRY (self));
+    editable = GTK_EDITABLE (self);
+    current_text = gtk_editable_get_text (editable);
     location = g_file_parse_name (current_text);
 
     if (g_file_equal (self->last_location, location))
@@ -566,11 +568,13 @@ static void
 on_entry_activate (GtkEntry *entry,
                    gpointer  user_data)
 {
+    GtkEditable *editable;
     g_autofree char *text = NULL;
     g_autofree char *uri_scheme = NULL;
     NautilusLocationEntry *self;
 
-    text = gtk_entry_get_text (entry);
+    editable = GTK_EDITABLE (entry);
+    text = gtk_editable_get_text (editable);
     text = g_strdup (text);
     text = g_strchug (text);
     text = g_strchomp (text);
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 3efed9e0d..8bcf2516a 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -313,6 +313,8 @@ nautilus_query_editor_get_location (NautilusQueryEditor *editor)
 static void
 create_query (NautilusQueryEditor *editor)
 {
+    GtkEditable *editable;
+    const char *text;
     NautilusQuery *query;
     gboolean fts_enabled;
 
@@ -325,11 +327,13 @@ create_query (NautilusQueryEditor *editor)
         return;
     }
 
+    editable = GTK_EDITABLE (editor->entry);
+    text = gtk_editable_get_text (editable);
     query = nautilus_query_new ();
 
     nautilus_query_set_search_content (query, fts_enabled);
 
-    nautilus_query_set_text (query, gtk_entry_get_text (GTK_ENTRY (editor->entry)));
+    nautilus_query_set_text (query, text);
     nautilus_query_set_location (query, editor->location);
 
     /* We only set the query using the global setting for recursivity here,
@@ -362,9 +366,12 @@ entry_changed_cb (GtkWidget           *entry,
     }
     else
     {
+        GtkEditable *editable;
         g_autofree gchar *text = NULL;
 
-        text = g_strdup (gtk_entry_get_text (GTK_ENTRY (editor->entry)));
+        editable = GTK_EDITABLE (entry);
+        text = gtk_editable_get_text (editable);
+        text = g_strdup (text);
         text = g_strstrip (text);
 
         nautilus_query_set_text (editor->query, text);
@@ -713,6 +720,7 @@ nautilus_query_editor_set_query (NautilusQueryEditor *self,
                                  NautilusQuery       *query)
 {
     g_autofree char *text = NULL;
+    GtkEditable *editable;
     g_autofree char *current_text = NULL;
 
     g_return_if_fail (NAUTILUS_IS_QUERY_EDITOR (self));
@@ -729,7 +737,9 @@ nautilus_query_editor_set_query (NautilusQueryEditor *self,
 
     self->change_frozen = TRUE;
 
-    current_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry)));
+    editable = GTK_EDITABLE (self->entry);
+    current_text = gtk_editable_get_text (editable);
+    current_text = g_strdup (current_text);
     current_text = g_strstrip (current_text);
     if (!g_str_equal (current_text, text))
     {
diff --git a/src/nautilus-rename-file-popover-controller.c b/src/nautilus-rename-file-popover-controller.c
index 3163e84fb..d0205d7e0 100644
--- a/src/nautilus-rename-file-popover-controller.c
+++ b/src/nautilus-rename-file-popover-controller.c
@@ -216,12 +216,15 @@ name_entry_on_f2_pressed (GtkWidget                           *widget,
     }
     else
     {
+        GtkEditable *editable;
+        const char *text;
         gint start_offset;
         gint end_offset;
 
+        editable = GTK_EDITABLE (widget);
+        text = gtk_editable_get_text (editable);
         /* Select the name part without the file extension */
-        eel_filename_get_rename_region (gtk_entry_get_text (GTK_ENTRY (widget)),
-                                        &start_offset, &end_offset);
+        eel_filename_get_rename_region (text, &start_offset, &end_offset);
         gtk_editable_select_region (GTK_EDITABLE (widget),
                                     start_offset, end_offset);
     }
diff --git a/src/nautilus-search-popover.c b/src/nautilus-search-popover.c
index 3de50f302..32f10bcab 100644
--- a/src/nautilus-search-popover.c
+++ b/src/nautilus-search-popover.c
@@ -156,14 +156,21 @@ static void
 date_entry_activate (GtkEntry              *entry,
                      NautilusSearchPopover *popover)
 {
-    if (gtk_entry_get_text_length (entry) > 0)
+    guint16 text_length;
+
+    text_length = gtk_entry_get_text_length (entry);
+    if (text_length > 0)
     {
+        GtkEditable *editable;
+        const char *text;
+        GDate *date;
         GDateTime *now;
         GDateTime *date_time;
-        GDate *date;
 
+        editable = GTK_EDITABLE (entry);
+        text = gtk_editable_get_text (editable);
         date = g_date_new ();
-        g_date_set_parse (date, gtk_entry_get_text (entry));
+        g_date_set_parse (date, text);
 
         /* Invalid date silently does nothing */
         if (!g_date_valid (date))