remove Conversation->Contact menu entry

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 4d6a092d3c8317fe9d70ab7e04a26b1b48e8eea0..8976dadda33681d1c93ec352706d732170ab6309 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -76,7 +76,6 @@ typedef struct {
        /* Menu items. */
        GtkUIManager *ui_manager;
        GtkAction   *menu_conv_insert_smiley;
-       GtkAction   *menu_conv_contact;
        GtkAction   *menu_conv_favorite;
 
        GtkAction   *menu_edit_cut;
@@ -488,20 +487,8 @@ chat_window_conv_activate_cb (GtkAction         *action,
                              EmpathyChatWindow *window)
 {
        EmpathyChatWindowPriv *priv = GET_PRIV (window);
-       GtkWidget             *menu = NULL;
-       GtkWidget             *submenu = NULL;
        gboolean               is_room;
 
-       /* Contact submenu */
-       submenu = empathy_chat_get_contact_menu (priv->current_chat);
-       if (submenu) {
-               menu = gtk_ui_manager_get_widget (priv->ui_manager,
-                       "/chats_menubar/menu_conv/menu_conv_contact");
-               gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
-               gtk_widget_show (submenu);
-       }
-       gtk_action_set_visible (priv->menu_conv_contact, submenu != NULL);
-
        /* Favorite room menu */
        is_room = empathy_chat_is_room (priv->current_chat);
        if (is_room) {
@@ -1326,7 +1313,6 @@ empathy_chat_window_init (EmpathyChatWindow *window)
                                       "chat_vbox", &chat_vbox,
                                       "ui_manager", &priv->ui_manager,
                                       "menu_conv_insert_smiley", &priv->menu_conv_insert_smiley,
-                                      "menu_conv_contact", &priv->menu_conv_contact,
                                       "menu_conv_favorite", &priv->menu_conv_favorite,
                                       "menu_edit_cut", &priv->menu_edit_cut,
                                       "menu_edit_copy", &priv->menu_edit_copy,

diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index a347a454ea84c6a38428d99b37098a8797f0fa4d..fb13af39a0d2b9cd863daecbc4bdc6b2ee08f47c 100644 (file)
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -25,12 +25,6 @@
             <property name="label" translatable="yes">Insert _Smiley</property>
           </object>
         </child>
-        <child>
-          <object class="GtkAction" id="menu_conv_contact">
-            <property name="name">menu_conv_contact</property>
-            <property name="label" translatable="yes">_Contact</property>
-          </object>
-        </child>
         <child>
           <object class="GtkToggleAction" id="menu_conv_favorite">
             <property name="name">menu_conv_favorite</property>
@@ -136,7 +130,6 @@
         <menu action="menu_conv">
           <menuitem action="menu_conv_clear"/>
           <menuitem action="menu_conv_insert_smiley"/>
-          <menuitem action="menu_conv_contact"/>
           <menuitem action="menu_conv_favorite"/>
           <separator/>
           <menuitem action="menu_conv_close"/>