Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 22281:c0ad0943cd6e
disapproval of revision '8bec06d2cd0a64ece46cb3cd73db9b085b91e161'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Sat, 09 Feb 2008 08:57:45 +0000 |
parents | bd25f8c9d94e |
children | 36036b9489fe ed6de6a3604f |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sat Feb 09 07:26:12 2008 +0000 +++ b/pidgin/gtkconv.c Sat Feb 09 08:57:45 2008 +0000 @@ -1186,17 +1186,6 @@ } static void -menu_send_attention_cb(gpointer data, guint action, GtkWidget *widget) -{ - PidginWindow *win = data; - PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); - - if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { - serv_send_attention(purple_conversation_get_gc(conv), purple_conversation_get_name(conv), 0); - } -} - -static void menu_add_pounce_cb(gpointer data, guint action, GtkWidget *widget) { PidginWindow *win = data; @@ -2963,7 +2952,6 @@ { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE }, - { N_("/Conversation/Send _Attention..."), NULL, menu_send_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION }, { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, 0, "<Item>", NULL }, { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, @@ -3270,9 +3258,6 @@ gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Send File...")); - win->menu.send_attention = - gtk_item_factory_get_widget(win->menu.item_factory, - N_("/Conversation/Send Attention")); win->menu.add_pounce = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Add Buddy Pounce...")); @@ -6260,7 +6245,6 @@ /* Deal with menu items */ gtk_widget_show(win->menu.view_log); gtk_widget_show(win->menu.send_file); - gtk_widget_show(win->menu.send_attention); gtk_widget_show(win->menu.add_pounce); gtk_widget_show(win->menu.get_info); gtk_widget_hide(win->menu.invite); @@ -6289,7 +6273,6 @@ /* Deal with menu items */ gtk_widget_show(win->menu.view_log); gtk_widget_hide(win->menu.send_file); - gtk_widget_hide(win->menu.send_attention); gtk_widget_hide(win->menu.add_pounce); gtk_widget_hide(win->menu.get_info); gtk_widget_show(win->menu.invite); @@ -6362,7 +6345,6 @@ gtk_widget_set_sensitive(win->menu.send_file, (prpl_info->send_file != NULL && (!prpl_info->can_receive_file || prpl_info->can_receive_file(gc, purple_conversation_get_name(conv))))); - gtk_widget_set_sensitive(win->menu.send_attention, (prpl_info->send_attention != NULL)); gtk_widget_set_sensitive(win->menu.alias, (account != NULL) && (purple_find_buddy(account, purple_conversation_get_name(conv)) != NULL)); @@ -6383,7 +6365,6 @@ /* Then deal with menu items */ gtk_widget_set_sensitive(win->menu.view_log, TRUE); gtk_widget_set_sensitive(win->menu.send_file, FALSE); - gtk_widget_set_sensitive(win->menu.send_attention, FALSE); gtk_widget_set_sensitive(win->menu.add_pounce, TRUE); gtk_widget_set_sensitive(win->menu.get_info, FALSE); gtk_widget_set_sensitive(win->menu.invite, FALSE);