aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-chat-window.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-05-22 03:07:12 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-05-22 17:43:08 +0800
commitefb2bc19461c213a1bd6917d5b7f25943f436c6d (patch)
tree25de718f3e7ee13ac615d6104907f5057846fecc /src/empathy-chat-window.c
parent47a2e02ba9ecb28fe12697d69b9f387783072775 (diff)
downloadgsoc2013-empathy-efb2bc19461c213a1bd6917d5b7f25943f436c6d.tar
gsoc2013-empathy-efb2bc19461c213a1bd6917d5b7f25943f436c6d.tar.gz
gsoc2013-empathy-efb2bc19461c213a1bd6917d5b7f25943f436c6d.tar.bz2
gsoc2013-empathy-efb2bc19461c213a1bd6917d5b7f25943f436c6d.tar.lz
gsoc2013-empathy-efb2bc19461c213a1bd6917d5b7f25943f436c6d.tar.xz
gsoc2013-empathy-efb2bc19461c213a1bd6917d5b7f25943f436c6d.tar.zst
gsoc2013-empathy-efb2bc19461c213a1bd6917d5b7f25943f436c6d.zip
remove Conversation->Contact menu entry
Diffstat (limited to 'src/empathy-chat-window.c')
-rw-r--r--src/empathy-chat-window.c14
1 files changed, 0 insertions, 14 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,