From 02ce3c9a8c3baff0c53a548cde8b959e6ec5c9b8 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 22 May 2009 17:05:09 +0100
Subject: move 'show offline contacts' menu entry to View

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

(limited to 'src')

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 7b6ec5d5d..cef3732b1 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -698,7 +698,7 @@ main_window_view_show_ft_manager (GtkAction         *action,
 }
 
 static void
-main_window_chat_show_offline_cb (GtkToggleAction   *action,
+main_window_view_show_offline_cb (GtkToggleAction   *action,
 				  EmpathyMainWindow *window)
 {
 	gboolean current;
@@ -1119,7 +1119,7 @@ empathy_main_window_show (void)
 				       "main_vbox", &window->main_vbox,
 				       "errors_vbox", &window->errors_vbox,
 				       "ui_manager", &window->ui_manager,
-				       "chat_show_offline", &show_offline_widget,
+				       "view_show_offline", &show_offline_widget,
 				       "chat_history", &window->chat_history,
 				       "room_join_favorites", &window->room_join_favorites,
 				       "presence_toolbar", &window->presence_toolbar,
@@ -1138,7 +1138,7 @@ empathy_main_window_show (void)
 			      "room_manage_favorites", "activate", main_window_room_manage_favorites_cb,
 			      "chat_add_contact", "activate", main_window_chat_add_contact_cb,
 			      "view_show_ft_manager", "activate", main_window_view_show_ft_manager,
-			      "chat_show_offline", "toggled", main_window_chat_show_offline_cb,
+			      "view_show_offline", "toggled", main_window_view_show_offline_cb,
 			      "edit", "activate", main_window_edit_cb,
 			      "edit_accounts", "activate", main_window_edit_accounts_cb,
 			      "edit_personal_information", "activate", main_window_edit_personal_information_cb,
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index dd3779dbf..bf9ebbca4 100644
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -41,8 +41,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkToggleAction" id="chat_show_offline">
-            <property name="name">chat_show_offline</property>
+          <object class="GtkToggleAction" id="view_show_offline">
+            <property name="name">view_show_offline</property>
             <property name="label" translatable="yes">Show _Offline Contacts</property>
           </object>
           <accelerator key="H" modifiers="GDK_CONTROL_MASK"/>
@@ -148,8 +148,6 @@
           <separator/>
           <menuitem action="chat_add_contact"/>
           <separator/>
-          <menuitem action="chat_show_offline"/>
-          <separator/>
           <menuitem action="chat_quit"/>
         </menu>
         <menu action="edit">
@@ -161,8 +159,9 @@
           <menuitem action="edit_preferences"/>
         </menu>
         <menu action="view">
-          <menuitem action="view_show_ft_manager"/>
+          <menuitem action="view_show_offline"/>
           <separator/>
+          <menuitem action="view_show_ft_manager"/>
         </menu>
         <menu action="room">
           <menuitem action="room_join_new"/>
-- 
cgit v1.2.3