aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/empathy-chat-window.c14
-rw-r--r--src/empathy-chat-window.ui7
2 files changed, 0 insertions, 21 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 4d6a092d3..8976dadda 100644
--- 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 a347a454e..fb13af39a 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -26,12 +26,6 @@
</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>
<property name="label" translatable="yes">_Favorite Chatroom</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"/>