GNOME.org
 

[file-roller/wip/gtk4: 5/54] gtk4: removed use of gtk_entry_(set|get)_text


commit 2d383a88aa3f332b1f50ddb803d9c37a09191724
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Sep 26 22:59:54 2022 +0200

    gtk4: removed use of gtk_entry_(set|get)_text

 src/dlg-add.c                 | 18 +++++++++---------
 src/dlg-delete.c              |  2 +-
 src/dlg-extract.c             |  2 +-
 src/fr-file-selector-dialog.c |  2 +-
 src/fr-new-archive-dialog.c   | 10 +++++-----
 src/fr-window.c               | 10 +++++-----
 src/gtk-utils.c               | 11 ++++-------
 7 files changed, 26 insertions(+), 29 deletions(-)
---
diff --git a/src/dlg-add.c b/src/dlg-add.c
index 022dde0d..3bbce2fe 100644
--- a/src/dlg-add.c
+++ b/src/dlg-add.c
@@ -109,15 +109,15 @@ file_selector_response_cb (GtkDialog *dialog,
        update = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("update_checkbutton")));
        follow_links = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET 
("follow_links_checkbutton")));
 
-       include_files = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("include_files_entry")));
+       include_files = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("include_files_entry")));
        if (_g_utf8_all_spaces (include_files))
                include_files = "*";
 
-       exclude_files = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("exclude_files_entry")));
+       exclude_files = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("exclude_files_entry")));
        if (_g_utf8_all_spaces (exclude_files))
                exclude_files = NULL;
 
-       exclude_folders = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("exclude_folders_entry")));
+       exclude_folders = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("exclude_folders_entry")));
        if (_g_utf8_all_spaces (exclude_folders))
                exclude_folders = NULL;
 
@@ -282,12 +282,12 @@ sync_widgets_with_options (DialogData *data,
 
        if ((include_files == NULL) || (include_files[0] == '\0'))
                include_files = "*";
-       gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("include_files_entry")), include_files);
+       gtk_editable_set_text (GTK_EDITABLE (GET_WIDGET ("include_files_entry")), include_files);
 
        if (exclude_files != NULL)
-               gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("exclude_files_entry")), exclude_files);
+               gtk_editable_set_text (GTK_EDITABLE (GET_WIDGET ("exclude_files_entry")), exclude_files);
        if (exclude_folders != NULL)
-               gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("exclude_folders_entry")), exclude_folders);
+               gtk_editable_set_text (GTK_EDITABLE (GET_WIDGET ("exclude_folders_entry")), exclude_folders);
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("update_checkbutton")), update);
 
        if ((data->window->archive != NULL) && data->window->archive->propAddCanStoreLinks) {
@@ -477,15 +477,15 @@ get_options_from_widgets (DialogData   *data,
        *update = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("update_checkbutton")));
        *no_symlinks = ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET 
("follow_links_checkbutton")));
 
-       *include_files = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("include_files_entry")));
+       *include_files = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("include_files_entry")));
        if (_g_utf8_all_spaces (*include_files))
                *include_files = "";
 
-       *exclude_files = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("exclude_files_entry")));
+       *exclude_files = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("exclude_files_entry")));
        if (_g_utf8_all_spaces (*exclude_files))
                *exclude_files = "";
 
-       *exclude_folders = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("exclude_folders_entry")));
+       *exclude_folders = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("exclude_folders_entry")));
        if (_g_utf8_all_spaces (*exclude_folders))
                *exclude_folders = "";
 }
diff --git a/src/dlg-delete.c b/src/dlg-delete.c
index 8655322b..4fd4f29f 100644
--- a/src/dlg-delete.c
+++ b/src/dlg-delete.c
@@ -75,7 +75,7 @@ response_cb (GtkDialog  *widget,
                else if (pattern_files) {
                        const char *pattern;
 
-                       pattern = gtk_entry_get_text (GTK_ENTRY (data->d_files_entry));
+                       pattern = gtk_editable_get_text (GTK_EDITABLE (data->d_files_entry));
                        file_list = fr_window_get_file_list_pattern (window, pattern);
                        if (file_list == NULL)
                                do_not_remove_if_null = TRUE;
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index 720922da..db9ebb9c 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -242,7 +242,7 @@ extract_cb_start_extracting (DialogData *data)
        else if (pattern_files) {
                const char *pattern;
 
-               pattern = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("file_pattern_entry")));
+               pattern = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("file_pattern_entry")));
                file_list = fr_window_get_file_list_pattern (window, pattern);
                if (file_list == NULL) {
                        gtk_window_destroy (GTK_WINDOW (data->dialog));
diff --git a/src/fr-file-selector-dialog.c b/src/fr-file-selector-dialog.c
index 6ccf15b1..91bb5dc7 100644
--- a/src/fr-file-selector-dialog.c
+++ b/src/fr-file-selector-dialog.c
@@ -148,7 +148,7 @@ set_current_folder (FrFileSelectorDialog *self,
                return;
 
        folder_name = g_file_get_parse_name (folder);
-       gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("location_entry")), folder_name);
+       gtk_editable_set_text (GTK_EDITABLE (GET_WIDGET ("location_entry")), folder_name);
        g_free (folder_name);
 
        gtk_places_sidebar_set_location (GTK_PLACES_SIDEBAR (GET_WIDGET ("places_sidebar")), folder);
diff --git a/src/fr-new-archive-dialog.c b/src/fr-new-archive-dialog.c
index 6f81276d..543b7aab 100644
--- a/src/fr-new-archive-dialog.c
+++ b/src/fr-new-archive-dialog.c
@@ -125,7 +125,7 @@ fr_new_archive_dialog_init (FrNewArchiveDialog *self)
 static void
 _fr_new_archive_dialog_update_sensitivity (FrNewArchiveDialog *self)
 {
-       gtk_widget_set_sensitive (gtk_dialog_get_widget_for_response (GTK_DIALOG (self), GTK_RESPONSE_OK), ! 
_g_utf8_all_spaces (gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("filename_entry")))));
+       gtk_widget_set_sensitive (gtk_dialog_get_widget_for_response (GTK_DIALOG (self), GTK_RESPONSE_OK), ! 
_g_utf8_all_spaces (gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("filename_entry")))));
        gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (GET_WIDGET ("encrypt_header_checkbutton")), ! 
self->can_encrypt_header);
        gtk_widget_set_sensitive (GET_WIDGET ("encrypt_header_checkbutton"), self->can_encrypt_header);
        gtk_widget_set_sensitive (GET_WIDGET ("volume_spinbutton"), ! self->can_create_volumes || 
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("volume_checkbutton"))));
@@ -238,7 +238,7 @@ _fr_new_archive_dialog_construct (FrNewArchiveDialog *self,
                char *default_name_no_ext;
 
                default_name_no_ext = _g_path_remove_extension_if_archive (default_name);
-               gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("filename_entry")), default_name_no_ext);
+               gtk_editable_set_text (GTK_EDITABLE (GET_WIDGET ("filename_entry")), default_name_no_ext);
 
                g_free (default_name_no_ext);
        }
@@ -342,7 +342,7 @@ fr_new_archive_dialog_get_file (FrNewArchiveDialog  *self,
 
        /* Check whether the user entered a valid archive name. */
 
-       basename = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("filename_entry")));
+       basename = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("filename_entry")));
        if ((basename == NULL) || (*basename == '\0')) {
                GtkWidget *d;
 
@@ -550,7 +550,7 @@ fr_new_archive_dialog_get_password (FrNewArchiveDialog *self)
        n_format = get_selected_format (self);
 
        if (mime_type_desc[n_format].capabilities & FR_ARCHIVE_CAN_ENCRYPT)
-               password = (char*) gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("password_entry")));
+               password = (char*) gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("password_entry")));
 
        return password;
 }
@@ -565,7 +565,7 @@ fr_new_archive_dialog_get_encrypt_header (FrNewArchiveDialog *self)
        n_format = get_selected_format (self);
 
        if (mime_type_desc[n_format].capabilities & FR_ARCHIVE_CAN_ENCRYPT) {
-               const char *password = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("password_entry")));
+               const char *password = gtk_editable_get_text (GTK_EDITABLE (GET_WIDGET ("password_entry")));
                if (password != NULL) {
                        if (strcmp (password, "") != 0) {
                                if (mime_type_desc[n_format].capabilities & FR_ARCHIVE_CAN_ENCRYPT_HEADER)
diff --git a/src/fr-window.c b/src/fr-window.c
index 3cb145b6..bd64daad 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -1352,7 +1352,7 @@ _fr_window_create_filter (FrWindow *window)
        const char *filter_str;
 
        filter = NULL;
-       filter_str = gtk_entry_get_text (GTK_ENTRY (private->filter_entry));
+       filter_str = gtk_editable_get_text (GTK_EDITABLE (private->filter_entry));
        if ((filter_str != NULL) && (*filter_str != '\0')) {
                char *escaped;
                char *pattern;
@@ -1732,7 +1732,7 @@ fr_window_update_current_location (FrWindow *window)
        if (private->list_mode == FR_WINDOW_LIST_MODE_FLAT)
                return;
 
-       gtk_entry_set_text (GTK_ENTRY (private->location_entry), private->archive_present? current_dir: "");
+       gtk_editable_set_text (GTK_EDITABLE (private->location_entry), private->archive_present? current_dir: 
"");
 
        fr_window_enable_action (window, "go-back", private->archive_present && (current_dir != NULL) && 
(private->history_current != NULL) && (private->history_current->next != NULL));
        fr_window_enable_action (window, "go-forward", private->archive_present && (current_dir != NULL) && 
(private->history_current != NULL) && (private->history_current->prev != NULL));
@@ -2023,7 +2023,7 @@ location_entry_key_press_event_cb (GtkWidget   *widget,
            || (event->keyval == GDK_KEY_ISO_Enter))
        {
        FrWindowPrivate *private = fr_window_get_instance_private (window);
-               fr_window_go_to_location (window, gtk_entry_get_text (GTK_ENTRY (private->location_entry)), 
FALSE);
+               fr_window_go_to_location (window, gtk_editable_get_text (GTK_EDITABLE 
(private->location_entry)), FALSE);
        }
 
        return FALSE;
@@ -7411,7 +7411,7 @@ fr_window_find (FrWindow *window,
                private->filter_mode = FALSE;
                private->list_mode = private->last_list_mode;
 
-               gtk_entry_set_text (GTK_ENTRY (private->filter_entry), "");
+               gtk_editable_set_text (GTK_EDITABLE (private->filter_entry), "");
                gtk_widget_hide (private->filter_bar);
 
                gtk_list_store_clear (private->list_store);
@@ -7420,7 +7420,7 @@ fr_window_find (FrWindow *window,
                fr_window_update_file_list (window, TRUE);
                fr_window_update_dir_tree (window);
                fr_window_update_current_location (window);
-               fr_window_go_to_location (window, gtk_entry_get_text (GTK_ENTRY (private->location_entry)), 
FALSE);
+               fr_window_go_to_location (window, gtk_editable_get_text (GTK_EDITABLE 
(private->location_entry)), FALSE);
        }
 }
 
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index bf873c24..51c0aad1 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -126,7 +126,7 @@ _gtk_request_dialog_run (GtkWindow      *parent,
 
        entry = _gtk_builder_get_widget (builder, "value_entry");
        gtk_entry_set_max_length (GTK_ENTRY (entry), max_length);
-       gtk_entry_set_text (GTK_ENTRY (entry), default_value);
+       gtk_editable_set_text (GTK_EDITABLE (entry), default_value);
 
        /* Add buttons */
 
@@ -143,7 +143,7 @@ _gtk_request_dialog_run (GtkWindow      *parent,
        gtk_widget_grab_focus (entry);
 
        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
-               result = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+               result = g_strdup (gtk_editable_get_text (GTK_EDITABLE (entry)));
        else
                result = NULL;
 
@@ -298,10 +298,7 @@ _gtk_entry_set_locale_text (GtkEntry   *entry,
                return;
 
        utf8_text = g_locale_to_utf8 (text, -1, NULL, NULL, NULL);
-       if (utf8_text != NULL)
-               gtk_entry_set_text (entry, utf8_text);
-       else
-               gtk_entry_set_text (entry, "");
+       gtk_editable_set_text (GTK_EDITABLE (entry), (utf8_text != NULL) ? utf8_text : "");
        g_free (utf8_text);
 }
 
@@ -312,7 +309,7 @@ _gtk_entry_get_locale_text (GtkEntry *entry)
        const char *utf8_text;
        char       *text;
 
-       utf8_text = gtk_entry_get_text (entry);
+       utf8_text = gtk_editable_get_text (GTK_EDITABLE (entry));
        if (utf8_text == NULL)
                return NULL;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]