From b3a5b441b884c25198b77ae014cde3b73d396257 Mon Sep 17 00:00:00 2001
From: Vitaly Minko <vitaly.minko@gmail.com>
Date: Mon, 18 Oct 2010 16:51:03 +0400
Subject: Move the 'Find in Contact List' item from the View menu to the Edit
 menu.

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

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index a62c9cd41..6c9b225dc 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -954,7 +954,7 @@ main_window_notify_contact_list_size_cb (GSettings         *gsettings,
 }
 
 static void
-main_window_view_search_contacts_cb (GtkCheckMenuItem  *item,
+main_window_edit_search_contacts_cb (GtkCheckMenuItem  *item,
 				     EmpathyMainWindow *window)
 {
 	EmpathyMainWindowPriv *priv = GET_PRIV (window);
@@ -1610,12 +1610,12 @@ empathy_main_window_init (EmpathyMainWindow *window)
 			      "view_show_protocols", "toggled", main_window_view_show_protocols_cb,
 			      "view_sort_by_name", "changed", main_window_view_sort_contacts_cb,
 			      "view_normal_size_with_avatars", "changed", main_window_view_contacts_list_size_cb,
-			      "view_search_contacts", "activate", main_window_view_search_contacts_cb,
 			      "view_show_map", "activate", main_window_view_show_map_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,
 			      "edit_preferences", "activate", main_window_edit_preferences_cb,
+			      "edit_search_contacts", "activate", main_window_edit_search_contacts_cb,
 			      "help_about", "activate", main_window_help_about_cb,
 			      "help_debug", "activate", main_window_help_debug_cb,
 			      "help_contents", "activate", main_window_help_contents_cb,
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index a328eacfe..6a86da721 100644
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -106,6 +106,12 @@
             <property name="label" translatable="yes">P_references</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="edit_search_contacts">
+            <property name="name">edit_search_contacts</property>
+            <property name="label" translatable="yes">Find in Contact _List</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="view">
             <property name="name">view</property>
@@ -165,12 +171,6 @@
           </object>
           <accelerator key="3" modifiers="GDK_CONTROL_MASK"/>
         </child>
-        <child>
-          <object class="GtkAction" id="view_search_contacts">
-            <property name="name">view_search_contacts</property>
-            <property name="label" translatable="yes">Find in Contact _List</property>
-          </object>
-        </child>
         <child>
           <object class="GtkAction" id="room">
             <property name="name">room</property>
@@ -242,6 +242,7 @@
           <menuitem action="edit_personal_information"/>
           <separator/>
           <menuitem action="edit_preferences"/>
+          <menuitem action="edit_search_contacts"/>
         </menu>
         <menu action="view">
           <menuitem action="view_show_offline"/>
@@ -254,7 +255,6 @@
           <menuitem action="view_normal_size"/>
           <menuitem action="view_compact_size"/>
           <separator/>
-          <menuitem action="view_search_contacts"/>
           <menuitem action="view_history"/>
           <menuitem action="view_show_ft_manager"/>
           <menuitem action="view_show_map"/>
-- 
cgit v1.2.3