Edit menu should be second from the left. Fixes bug #467827 (Reinout van

2007-08-19 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-main-window.glade: Edit menu should be second
	from the left. Fixes bug #467827 (Reinout van Schouwen).

svn path=/trunk/; revision=262

diff --git a/ChangeLog b/ChangeLog
index 2bc7fe7c50744a1837ef31033790b01c644c1479..5136b16fea0930c367fed2534083e6836234c40f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-19 Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy-gtk/empathy-main-window.glade: Edit menu should be second
+       from the left. Fixes bug #467827 (Reinout van Schouwen).
+
 2007-08-13 Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-group-chat.c: Only update the topic of it has

diff --git a/libempathy-gtk/empathy-main-window.glade b/libempathy-gtk/empathy-main-window.glade
index 89c42abfedbfa0b3a83ba21e839d87f5103e40dc..c8b5e3e48dce24ee53c3d99f04a5390266c8fcfb 100644 (file)
--- a/libempathy-gtk/empathy-main-window.glade
+++ b/libempathy-gtk/empathy-main-window.glade
@@ -157,66 +157,62 @@
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="room">
+           <widget class="GtkMenuItem" id="edit">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">_Room</property>
+             <property name="label" translatable="yes">_Edit</property>
              <property name="use_underline">True</property>
 
              <child>
-               <widget class="GtkMenu" id="room_menu">
+               <widget class="GtkMenu" id="edit_menu">
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="room_join_new">
+                   <widget class="GtkMenuItem" id="edit_context">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Join _New...</property>
+                     <property name="label" translatable="yes">Context</property>
                      <property name="use_underline">True</property>
+                   </widget>
+                 </child>
 
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image889">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-new</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
+                 <child>
+                   <widget class="GtkSeparatorMenuItem" id="edit_context_separator">
+                     <property name="visible">True</property>
                    </widget>
                  </child>
 
                  <child>
-                   <widget class="GtkMenuItem" id="room_join_favorites">
+                   <widget class="GtkMenuItem" id="edit_accounts">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Join _Favorites</property>
+                     <property name="label" translatable="yes">_Accounts</property>
                      <property name="use_underline">True</property>
-                     <accelerator key="F5" modifiers="0" signal="activate"/>
+                     <accelerator key="F4" modifiers="0" signal="activate"/>
                    </widget>
                  </child>
 
                  <child>
-                   <widget class="GtkSeparatorMenuItem" id="room_sep">
+                   <widget class="GtkMenuItem" id="edit_personal_information">
                      <property name="visible">True</property>
+                     <property name="label" translatable="yes">_Personal Information</property>
+                     <property name="use_underline">True</property>
                    </widget>
                  </child>
 
                  <child>
-                   <widget class="GtkSeparatorMenuItem" id="room_sep2">
+                   <widget class="GtkSeparatorMenuItem" id="separator2">
                      <property name="visible">True</property>
                    </widget>
                  </child>
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="room_manage_favorites">
+                   <widget class="GtkImageMenuItem" id="edit_preferences">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Manage Favorites...</property>
+                     <property name="label" translatable="yes">_Preferences</property>
                      <property name="use_underline">True</property>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image890">
+                       <widget class="GtkImage" id="image891">
                          <property name="visible">True</property>
+                         <property name="stock">gtk-preferences</property>
                          <property name="icon_size">1</property>
-                         <property name="icon_name">empathy-group-message</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
                          <property name="xpad">0</property>
@@ -231,62 +227,66 @@
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="edit">
+           <widget class="GtkMenuItem" id="room">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">_Edit</property>
+             <property name="label" translatable="yes">_Room</property>
              <property name="use_underline">True</property>
 
              <child>
-               <widget class="GtkMenu" id="edit_menu">
+               <widget class="GtkMenu" id="room_menu">
 
                  <child>
-                   <widget class="GtkMenuItem" id="edit_context">
+                   <widget class="GtkImageMenuItem" id="room_join_new">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Context</property>
+                     <property name="label" translatable="yes">Join _New...</property>
                      <property name="use_underline">True</property>
-                   </widget>
-                 </child>
 
-                 <child>
-                   <widget class="GtkSeparatorMenuItem" id="edit_context_separator">
-                     <property name="visible">True</property>
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image889">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-new</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
                    </widget>
                  </child>
 
                  <child>
-                   <widget class="GtkMenuItem" id="edit_accounts">
+                   <widget class="GtkMenuItem" id="room_join_favorites">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Accounts</property>
+                     <property name="label" translatable="yes">Join _Favorites</property>
                      <property name="use_underline">True</property>
-                     <accelerator key="F4" modifiers="0" signal="activate"/>
+                     <accelerator key="F5" modifiers="0" signal="activate"/>
                    </widget>
                  </child>
 
                  <child>
-                   <widget class="GtkMenuItem" id="edit_personal_information">
+                   <widget class="GtkSeparatorMenuItem" id="room_sep">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Personal Information</property>
-                     <property name="use_underline">True</property>
                    </widget>
                  </child>
 
                  <child>
-                   <widget class="GtkSeparatorMenuItem" id="separator2">
+                   <widget class="GtkSeparatorMenuItem" id="room_sep2">
                      <property name="visible">True</property>
                    </widget>
                  </child>
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="edit_preferences">
+                   <widget class="GtkImageMenuItem" id="room_manage_favorites">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Preferences</property>
+                     <property name="label" translatable="yes">Manage Favorites...</property>
                      <property name="use_underline">True</property>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image891">
+                       <widget class="GtkImage" id="image890">
                          <property name="visible">True</property>
-                         <property name="stock">gtk-preferences</property>
                          <property name="icon_size">1</property>
+                         <property name="icon_name">empathy-group-message</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
                          <property name="xpad">0</property>