From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 20 Jan 2012 12:46:08 +0000 (+0100)
Subject: remove 'edit->personnal information' menu
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=37ed9b06e807879e60cc9dbc2fa5b17bc620178b

remove 'edit->personnal information' menu

It's done in empathy-accounts now.

https://bugzilla.gnome.org/show_bug.cgi?id=668336
---

diff --git a/src/empathy-roster-window-menubar.ui b/src/empathy-roster-window-menubar.ui
index 0bb5d14f..d342abca 100644
--- a/src/empathy-roster-window-menubar.ui
+++ b/src/empathy-roster-window-menubar.ui
@@ -108,12 +108,6 @@
           </object>
           <accelerator key="F4" modifiers=""/>
         </child>
-        <child>
-          <object class="GtkAction" id="edit_personal_information">
-            <property name="name">edit_personal_information</property>
-            <property name="label" translatable="yes">_Personal Information</property>
-          </object>
-        </child>
         <child>
           <object class="GtkAction" id="edit_blocked_contacts">
             <property name="name">edit_blocked_contacts</property>
@@ -263,7 +257,6 @@
           <menuitem action="edit_context"/>
           <separator name="edit_context_separator"/>
           <menuitem action="edit_accounts"/>
-          <menuitem action="edit_personal_information"/>
           <menuitem action="edit_search_contacts"/>
           <menuitem action="edit_blocked_contacts"/>
           <separator/>
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index f45474cf..575f719c 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -1940,13 +1940,6 @@ roster_window_edit_accounts_cb (GtkAction *action,
       NULL, FALSE, FALSE);
 }
 
-static void
-roster_window_edit_personal_information_cb (GtkAction *action,
-    EmpathyRosterWindow *self)
-{
-  empathy_contact_personal_dialog_show (GTK_WINDOW (self));
-}
-
 static void
 roster_window_edit_blocked_contacts_cb (GtkAction *action,
     EmpathyRosterWindow *self)
@@ -2365,7 +2358,6 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
       "view_show_map", "activate", roster_window_view_show_map_cb,
       "edit", "activate", roster_window_edit_cb,
       "edit_accounts", "activate", roster_window_edit_accounts_cb,
-      "edit_personal_information", "activate", roster_window_edit_personal_information_cb,
       "edit_blocked_contacts", "activate", roster_window_edit_blocked_contacts_cb,
       "edit_preferences", "activate", roster_window_edit_preferences_cb,
       "edit_search_contacts", "activate", roster_window_edit_search_contacts_cb,