From 92633f9ea0e68abe84d0f8a77ddc5b9691a8a8d1 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 22 May 2009 17:01:18 +0100
Subject: move 'show file transfers' menu entry to View

---
 src/empathy-main-window.c  | 4 ++--
 src/empathy-main-window.ui | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index d2a7b2d45..7b6ec5d5d 100644
--- 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 cdfdbedb2..dd3779dbf 100644
--- 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"/>
-- 
cgit v1.2.3