[gnome-software] Define list boxes in the .ui

[Matthias Clasen <matthiasc src gnome org>]

commit 1dfd16f1273fe0771233bd05563cf28b5db43a3e
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Sep 1 02:42:20 2013 -0400

    Define list boxes in the .ui
    
    No need to construct these widgets manually.

 src/gnome-software.ui    |   18 +++++++++++++++---
 src/gs-shell-installed.c |   14 +++-----------
 src/gs-shell-search.c    |   16 ++++------------
 src/gs-shell-updates.c   |    7 +------
 4 files changed, 23 insertions(+), 32 deletions(-)
---
diff --git a/src/gnome-software.ui b/src/gnome-software.ui
index 7e32f4d..88ece41 100644
--- a/src/gnome-software.ui
+++ b/src/gnome-software.ui
@@ -473,7 +473,11 @@
                       <class name="main-scrolled-software"/>
                     </style>
                     <child>
-                      <placeholder/>
+                      <object class="GtkListBox" id="list_box_install">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="selection_mode">none</property>
+                      </object>
                     </child>
                   </object>
                   <packing>
@@ -561,7 +565,11 @@
                       <class name="main-scrolled-software"/>
                     </style>
                     <child>
-                      <placeholder/>
+                      <object class="GtkListBox" id="list_box_search">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="selection_mode">none</property>
+                      </object>
                     </child>
                   </object>
                   <packing>
@@ -605,7 +613,11 @@
                       <class name="main-scrolled-software"/>
                     </style>
                     <child>
-                      <placeholder/>
+                      <object class="GtkListBox" id="list_box_updates">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="selection_mode">none</property>
+                      </object>
                     </child>
                   </object>
                   <packing>
diff --git a/src/gs-shell-installed.c b/src/gs-shell-installed.c
index 75ad14c..ccdcc95 100644
--- a/src/gs-shell-installed.c
+++ b/src/gs-shell-installed.c
@@ -425,7 +425,6 @@ gs_shell_installed_setup (GsShellInstalled *shell_installed,
                          GCancellable *cancellable)
 {
        GsShellInstalledPrivate *priv = shell_installed->priv;
-       GtkWidget *widget;
 
        g_return_if_fail (GS_IS_SHELL_INSTALLED (shell_installed));
 
@@ -439,22 +438,15 @@ gs_shell_installed_setup (GsShellInstalled *shell_installed,
        priv->cancellable = g_object_ref (cancellable);
 
        /* setup installed */
-       priv->list_box_installed = GTK_LIST_BOX (gtk_list_box_new ());
+       priv->list_box_installed = GTK_LIST_BOX (gtk_builder_get_object (priv->builder, "list_box_install"));
        g_signal_connect (priv->list_box_installed, "row-activated",
                          G_CALLBACK (gs_shell_installed_app_widget_activated_cb), shell_installed);
        gtk_list_box_set_header_func (priv->list_box_installed,
                                      gs_shell_installed_list_header_func,
-                                     shell_installed,
-                                     NULL);
+                                     shell_installed, NULL);
        gtk_list_box_set_sort_func (priv->list_box_installed,
                                    gs_shell_installed_sort_func,
-                                   shell_installed,
-                                   NULL);
-       gtk_list_box_set_selection_mode (priv->list_box_installed,
-                                        GTK_SELECTION_NONE);
-       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_install"));
-       gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->list_box_installed));
-       gtk_widget_show (GTK_WIDGET (priv->list_box_installed));
+                                   shell_installed, NULL);
 }
 
 /**
diff --git a/src/gs-shell-search.c b/src/gs-shell-search.c
index 9602250..a79c80c 100644
--- a/src/gs-shell-search.c
+++ b/src/gs-shell-search.c
@@ -428,26 +428,18 @@ gs_shell_search_setup (GsShellSearch *shell_search,
                          G_CALLBACK (gs_shell_search_filter_text_changed_cb), shell_search);
 
        /* setup search */
-       priv->list_box_search = GTK_LIST_BOX (gtk_list_box_new ());
+       priv->list_box_search = GTK_LIST_BOX (gtk_builder_get_object (priv->builder, "list_box_search"));
        g_signal_connect (priv->list_box_search, "row-activated",
                          G_CALLBACK (gs_shell_search_app_widget_activated_cb), shell_search);
        gtk_list_box_set_header_func (priv->list_box_search,
                                      gs_shell_search_list_header_func,
-                                     shell_search,
-                                     NULL);
+                                     shell_search, NULL);
        gtk_list_box_set_filter_func (priv->list_box_search,
                                      gs_shell_search_filter_func,
-                                     shell_search,
-                                     NULL);
+                                     shell_search, NULL);
        gtk_list_box_set_sort_func (priv->list_box_search,
                                    gs_shell_search_sort_func,
-                                   shell_search,
-                                   NULL);
-       gtk_list_box_set_selection_mode (priv->list_box_search,
-                                        GTK_SELECTION_NONE);
-       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_search"));
-       gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->list_box_search));
-       gtk_widget_show (GTK_WIDGET (priv->list_box_search));
+                                   shell_search, NULL);
 }
 
 /**
diff --git a/src/gs-shell-updates.c b/src/gs-shell-updates.c
index 5a53aba..eda8f90 100644
--- a/src/gs-shell-updates.c
+++ b/src/gs-shell-updates.c
@@ -485,18 +485,13 @@ gs_shell_updates_setup (GsShellUpdates *shell_updates,
        priv->cancellable = g_object_ref (cancellable);
 
        /* setup updates */
-       priv->list_box_updates = GTK_LIST_BOX (gtk_list_box_new ());
+       priv->list_box_updates = GTK_LIST_BOX (gtk_builder_get_object (priv->builder, "list_box_updates"));
        g_signal_connect (priv->list_box_updates, "row-activated",
                          G_CALLBACK (gs_shell_updates_activated_cb), shell_updates);
        gtk_list_box_set_header_func (priv->list_box_updates,
                                      gs_shell_updates_list_header_func,
                                      shell_updates,
                                      NULL);
-       gtk_list_box_set_selection_mode (priv->list_box_updates,
-                                        GTK_SELECTION_NONE);
-       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_updates"));
-       gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->list_box_updates));
-       gtk_widget_show (GTK_WIDGET (priv->list_box_updates));
 
         widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "list_box_update"));
        g_signal_connect (GTK_LIST_BOX (widget), "row-activated",