move 'show file transfers' menu entry to View

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index d2a7b2d4514d2290c25c47f581e1f391bcbe45d7..7b6ec5d5d3476c7e1ec0da15e149eb0ba93e2a04 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -684,7 +684,7 @@ main_window_chat_add_contact_cb (GtkAction         *action,
 }
 
 static void
-main_window_chat_show_ft_manager (GtkAction         *action,
+main_window_view_show_ft_manager (GtkAction         *action,
                                  EmpathyMainWindow *window)
 {
        EmpathyFTManager *manager;
@@ -1137,7 +1137,7 @@ empathy_main_window_show (void)
                              "room_join_favorites", "activate", main_window_room_join_favorites_cb,
                              "room_manage_favorites", "activate", main_window_room_manage_favorites_cb,
                              "chat_add_contact", "activate", main_window_chat_add_contact_cb,
-                             "chat_show_ft_manager", "activate", main_window_chat_show_ft_manager,
+                             "view_show_ft_manager", "activate", main_window_view_show_ft_manager,
                              "chat_show_offline", "toggled", main_window_chat_show_offline_cb,
                              "edit", "activate", main_window_edit_cb,
                              "edit_accounts", "activate", main_window_edit_accounts_cb,

diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index cdfdbedb2470d55bf3faf574890bb07bfc1861cf..dd3779dbf06618722148fc8d1a68d4a4655a5610 100644 (file)
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -34,9 +34,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="chat_show_ft_manager">
+          <object class="GtkAction" id="view_show_ft_manager">
             <property name="icon-name">document-send</property>
-            <property name="name">chat_show_ft_manager</property>
+            <property name="name">view_show_ft_manager</property>
             <property name="label" translatable="yes">Show _File Transfers</property>
           </object>
         </child>
@@ -148,8 +148,6 @@
           <separator/>
           <menuitem action="chat_add_contact"/>
           <separator/>
-          <menuitem action="chat_show_ft_manager"/>
-          <separator/>
           <menuitem action="chat_show_offline"/>
           <separator/>
           <menuitem action="chat_quit"/>
@@ -163,6 +161,8 @@
           <menuitem action="edit_preferences"/>
         </menu>
         <menu action="view">
+          <menuitem action="view_show_ft_manager"/>
+          <separator/>
         </menu>
         <menu action="room">
           <menuitem action="room_join_new"/>