[gtk/matthiasc/for-main: 2/2] filechooser: Stop using entrycompletion api
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/for-main: 2/2] filechooser: Stop using entrycompletion api
- Date: Thu, 13 Oct 2022 02:04:34 +0000 (UTC)
commit fa3c8ed5f9a9a9679dd8e65b4988bb605a58bf47
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Oct 12 00:06:21 2022 -0400
filechooser: Stop using entrycompletion api
The file chooser entry now has an api for this.
gtk/gtkfilechooserwidget.c | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 8b00a40e65..3cd9a18942 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -4771,19 +4771,11 @@ update_chooser_entry (GtkFileChooserWidget *impl)
if (change_entry && !impl->auto_selecting_first_row)
{
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ g_signal_handlers_block_by_func (impl->location_entry, G_CALLBACK (location_entry_changed_cb),
impl);
- GtkEntryCompletion *completion = gtk_entry_get_completion (GTK_ENTRY (impl->location_entry));
+ gtk_file_chooser_entry_set_text (GTK_FILE_CHOOSER_ENTRY (impl->location_entry),
impl->browse_files_last_selected_name);
- if (completion)
- gtk_entry_completion_set_popup_completion (completion, FALSE);
- g_signal_handlers_block_by_func (impl->location_entry, G_CALLBACK (location_entry_changed_cb),
impl);
- gtk_editable_set_text (GTK_EDITABLE (impl->location_entry),
impl->browse_files_last_selected_name);
g_signal_handlers_unblock_by_func (impl->location_entry, G_CALLBACK
(location_entry_changed_cb), impl);
- if (completion)
- gtk_entry_completion_set_popup_completion (completion, TRUE);
-
-G_GNUC_END_IGNORE_DEPRECATIONS
if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
_gtk_file_chooser_entry_select_filename (GTK_FILE_CHOOSER_ENTRY (impl->location_entry));
@@ -5124,22 +5116,12 @@ gtk_file_chooser_widget_set_current_name (GtkFileChooser *chooser,
const char *name)
{
GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (chooser);
- GtkEntryCompletion *completion;
g_return_if_fail (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE);
pending_select_files_free (impl);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
- completion = gtk_entry_get_completion (GTK_ENTRY (impl->location_entry));
- gtk_entry_completion_set_popup_completion (completion, FALSE);
-
- gtk_editable_set_text (GTK_EDITABLE (impl->location_entry), name);
-
- gtk_entry_completion_set_popup_completion (completion, TRUE);
-
-G_GNUC_END_IGNORE_DEPRECATIONS
+ gtk_file_chooser_entry_set_text (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), name);
}
static char *
@@ -7122,7 +7104,7 @@ static void
location_set_user_text (GtkFileChooserWidget *impl,
const char *path)
{
- gtk_editable_set_text (GTK_EDITABLE (impl->location_entry), path);
+ gtk_file_chooser_entry_set_text (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), path);
gtk_editable_set_position (GTK_EDITABLE (impl->location_entry), -1);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]