Move live search to top of Contact list

https://bugzilla.gnome.org/show_bug.cgi?id=656999

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 167e338d690a7b936aaaf80f405b77169fc3d5fb..62089b8b2c8df5cd238e8fdacd2a10a31ec869eb 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -2105,6 +2105,7 @@ empathy_main_window_init (EmpathyMainWindow *window)
        gchar                    *filename;
        GSList                   *l;
        GtkTreeModel             *model;
+       GtkWidget                *search_vbox;
 
        priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window,
                        EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindowPriv);
@@ -2141,6 +2142,7 @@ empathy_main_window_init (EmpathyMainWindow *window)
                                       "no_entry_label", &priv->no_entry_label,
                                       "roster_scrolledwindow", &sw,
                                       "view_balance_show_in_roster", &priv->view_balance_show_in_roster,
+                                      "search_vbox", &search_vbox,
                                       NULL);
        g_free (filename);
 
@@ -2280,8 +2282,9 @@ empathy_main_window_init (EmpathyMainWindow *window)
                GTK_WIDGET (priv->individual_view));
        empathy_individual_view_set_live_search (priv->individual_view,
                EMPATHY_LIVE_SEARCH (priv->search_bar));
-       gtk_box_pack_start (GTK_BOX (priv->main_vbox), priv->search_bar,
+       gtk_box_pack_start (GTK_BOX (search_vbox), priv->search_bar,
                FALSE, TRUE, 0);
+
        g_signal_connect_swapped (window, "map",
                G_CALLBACK (gtk_widget_grab_focus), priv->individual_view);
 

diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index b21a07bac5483846a710eb2d99553ffb06229d6a..bab01c10e16971ce48f2a80033c64a57fe9786a5 100644 (file)
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -363,6 +363,19 @@
             <property name="position">4</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkVBox" id="search_vbox">
+            <property name="visible">True</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
@@ -395,7 +408,7 @@
             </child>
           </object>
           <packing>
-            <property name="position">5</property>
+            <property name="position">6</property>
           </packing>
         </child>
       </object>