Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file chooser: Simplify search entry callback

Browse Source
This commit is contained in:
Matthias Clasen
2015-01-28 16:02:03 -05:00
parent d270c5524f
commit 1d64175c4b
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkfilechooserwidget.c
View File

@@ -526,8 +526,7 @@ static void search_clear_model (GtkFileChooserWidget *impl,
gboolean remove_from_treeview);
static gboolean search_should_respond (GtkFileChooserWidget *impl);
static GSList *search_get_selected_files (GtkFileChooserWidget *impl);
static void search_entry_activate_cb (GtkEntry *entry,
gpointer data);
static void search_entry_activate_cb (GtkFileChooserWidget *impl);
static void settings_load (GtkFileChooserWidget *impl);
static void show_filters (GtkFileChooserWidget *impl,
@@ -5926,7 +5925,7 @@ gtk_file_chooser_widget_should_respond (GtkFileChooserEmbed *chooser_embed)
}
else if (priv->operation_mode == OPERATION_MODE_SEARCH && priv->toplevel_last_focus_widget == priv->search_entry)
{
search_entry_activate_cb (GTK_ENTRY (priv->search_entry), impl);
search_entry_activate_cb (impl);
return FALSE;
}
else if (priv->location_entry && priv->toplevel_last_focus_widget == priv->location_entry)
@@ -6238,10 +6237,8 @@ search_start_query (GtkFileChooserWidget *impl,
* entry; starts the query
*/
static void
search_entry_activate_cb (GtkEntry *entry,
gpointer data)
search_entry_activate_cb (GtkFileChooserWidget *impl)
{
GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (data);
GtkFileChooserWidgetPrivate *priv = impl->priv;
const char *text;

2
gtk/ui/gtkfilechooserwidget.ui
View File

@@ -130,7 +130,7 @@
<object class="GtkSearchEntry" id="search_entry">
<property name="visible">True</property>
<property name="hexpand">True</property>
<signal name="search-changed" handler="search_entry_activate_cb" swapped="no"/>
<signal name="search-changed" handler="search_entry_activate_cb" swapped="yes"/>
</object>
</child>
</object>