Merge branch 'debugger'

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

diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index a347a454ea84c6a38428d99b37098a8797f0fa4d..8c8ea7d006ff93cb83e33d0826038875475d1ae5 100644 (file)
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -25,18 +25,19 @@
             <property name="label" translatable="yes">Insert _Smiley</property>
           </object>
         </child>
-        <child>
-          <object class="GtkAction" id="menu_conv_contact">
-            <property name="name">menu_conv_contact</property>
-            <property name="label" translatable="yes">_Contact</property>
-          </object>
-        </child>
         <child>
           <object class="GtkToggleAction" id="menu_conv_favorite">
             <property name="name">menu_conv_favorite</property>
             <property name="label" translatable="yes">_Favorite Chatroom</property>
           </object>
         </child>
+        <child>
+          <object class="GtkToggleAction" id="menu_conv_toggle_contacts">
+            <property name="name">menu_conv_toggle_contacts</property>
+            <property name="active">TRUE</property>
+            <property name="label" translatable="yes">_Show Contact List</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="menu_conv_close">
             <property name="stock_id">gtk-close</property>
@@ -44,6 +45,12 @@
           </object>
           <accelerator key="W" modifiers="GDK_CONTROL_MASK"/>
         </child>
+        <child>
+          <object class="GtkAction" id="menu_contact">
+            <property name="name">menu_contact</property>
+            <property name="label" translatable="yes">_Contact</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="menu_edit">
             <property name="name">menu_edit</property>
@@ -136,11 +143,12 @@
         <menu action="menu_conv">
           <menuitem action="menu_conv_clear"/>
           <menuitem action="menu_conv_insert_smiley"/>
-          <menuitem action="menu_conv_contact"/>
           <menuitem action="menu_conv_favorite"/>
+          <menuitem action="menu_conv_toggle_contacts"/>
           <separator/>
           <menuitem action="menu_conv_close"/>
         </menu>
+        <menu action="menu_contact" />
         <menu action="menu_edit">
           <menuitem action="menu_edit_cut"/>
           <menuitem action="menu_edit_copy"/>