[gnome-software: 7/10] shell: Rename search and menu buttons

[Philip Withnall <pwithnall src gnome org>]

commit 7f93808e38e648d04c6a67d64fa170b71d90f114
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Mon Jun 21 11:48:27 2021 +0200

    shell: Rename search and menu buttons
    
    No need to suffix them anymore as there is only one now.

 src/gs-shell.c  | 8 ++++----
 src/gs-shell.ui | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/gs-shell.c b/src/gs-shell.c
index a660d972c..cf228c137 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -91,7 +91,7 @@ struct _GsShell
        GtkWidget               *main_header;
        GtkWidget               *details_header;
        GtkWidget               *metered_updates_bar;
-       GtkWidget               *search_button_main;
+       GtkWidget               *search_button;
        GtkWidget               *entry_search;
        GtkWidget               *search_bar;
        GtkWidget               *button_back;
@@ -466,13 +466,13 @@ update_header_widgets (GsShell *shell)
        GsShellMode mode = gs_shell_get_mode (shell);
 
        /* only show the search button in overview and search pages */
-       g_signal_handlers_block_by_func (shell->search_button_main, search_button_clicked_cb, shell);
+       g_signal_handlers_block_by_func (shell->search_button, search_button_clicked_cb, shell);
 
        /* hide unless we're going to search */
        hdy_search_bar_set_search_mode (HDY_SEARCH_BAR (shell->search_bar),
                                        mode == GS_SHELL_MODE_SEARCH);
 
-       g_signal_handlers_unblock_by_func (shell->search_button_main, search_button_clicked_cb, shell);
+       g_signal_handlers_unblock_by_func (shell->search_button, search_button_clicked_cb, shell);
 }
 
 static void
@@ -2507,7 +2507,7 @@ gs_shell_class_init (GsShellClass *klass)
        gtk_widget_class_bind_template_child (widget_class, GsShell, stack_main);
        gtk_widget_class_bind_template_child (widget_class, GsShell, stack_sub);
        gtk_widget_class_bind_template_child (widget_class, GsShell, metered_updates_bar);
-       gtk_widget_class_bind_template_child (widget_class, GsShell, search_button_main);
+       gtk_widget_class_bind_template_child (widget_class, GsShell, search_button);
        gtk_widget_class_bind_template_child (widget_class, GsShell, entry_search);
        gtk_widget_class_bind_template_child (widget_class, GsShell, search_bar);
        gtk_widget_class_bind_template_child (widget_class, GsShell, button_back);
diff --git a/src/gs-shell.ui b/src/gs-shell.ui
index 9269e4817..3ba883785 100644
--- a/src/gs-shell.ui
+++ b/src/gs-shell.ui
@@ -158,7 +158,7 @@
                                         <property name="show-close-button">True</property>
                                         <property name="centering-policy">strict</property>
                                         <child>
-                                          <object class="GtkToggleButton" id="search_button_main">
+                                          <object class="GtkToggleButton" id="search_button">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="active" bind-source="search_bar" 
bind-property="search-mode-enabled" bind-flags="sync-create|bidirectional" />
@@ -187,7 +187,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkMenuButton" id="menu_button_main">
+                                          <object class="GtkMenuButton" id="menu_button">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="sensitive">True</property>