Merge branch 'sasl'

[empathy.git] / src / empathy-main-window.ui

diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index 2fc81b40811bd726b6476a6ff0d69774d402310c..8356a1af754903323d746331d105c7686b937085 100644 (file)
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -106,6 +106,12 @@
             <property name="label" translatable="yes">P_references</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="edit_search_contacts">
+            <property name="name">edit_search_contacts</property>
+            <property name="label" translatable="yes">Find in Contact _List</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="view">
             <property name="name">view</property>
@@ -234,6 +240,7 @@
           <separator name="edit_context_separator"/>
           <menuitem action="edit_accounts"/>
           <menuitem action="edit_personal_information"/>
+          <menuitem action="edit_search_contacts"/>
           <separator/>
           <menuitem action="edit_preferences"/>
         </menu>
@@ -267,12 +274,6 @@
       </menubar>
     </ui>
   </object>
-  <object class="GtkWindow" id="main_window">
-    <property name="title" translatable="yes">Contact List</property>
-    <property name="role">contact_list</property>
-    <property name="default_width">225</property>
-    <property name="default_height">325</property>
-    <child>
       <object class="GtkVBox" id="main_vbox">
         <property name="visible">True</property>
         <child>
@@ -308,14 +309,34 @@
           </packing>
         </child>
         <child>
-          <object class="GtkScrolledWindow" id="roster_scrolledwindow">
+          <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="has_focus">True</property>
-            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="show_tabs">False</property>
+            <property name="show_border">False</property>
             <child>
-              <placeholder/>
+              <object class="GtkScrolledWindow" id="roster_scrolledwindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="has_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="no_entry_label">
+                <property name="visible">True</property>
+                <property name="yalign">0.30000001192092896</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -323,6 +344,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>