Mercurial > pidgin.yaz

comparison pidgin/gtkconv.c @ 15560:442128853bdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
toolbar/menu icons. reduce the imhtmltoolbar spacing. more gaimstock pruning
author Sean Egan <seanegan@gmail.com>
date Mon, 05 Feb 2007 12:13:18 +0000
parents 00fa07da4175
children 74b945e7609c
comparison
equal deleted inserted replaced
15559:dad51c0e3bc6 15560:442128853bdb
1574 is_me = TRUE; 1574 is_me = TRUE;
1575 1575
1576 menu = gtk_menu_new(); 1576 menu = gtk_menu_new();
1577 1577
1578 if (!is_me) { 1578 if (!is_me) {
1579 button = pidgin_new_item_from_stock(menu, _("IM"), PIDGIN_STOCK_IM, 1579 button = pidgin_new_item_from_stock(menu, _("IM"), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW,
1580 G_CALLBACK(menu_chat_im_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); 1580 G_CALLBACK(menu_chat_im_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
1581 1581
1582 if (gc == NULL) 1582 if (gc == NULL)
1583 gtk_widget_set_sensitive(button, FALSE); 1583 gtk_widget_set_sensitive(button, FALSE);
1584 1584
1613 1613
1614 g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); 1614 g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free);
1615 } 1615 }
1616 1616
1617 if (prpl_info && (prpl_info->get_info || prpl_info->get_cb_info)) { 1617 if (prpl_info && (prpl_info->get_info || prpl_info->get_cb_info)) {
1618 button = pidgin_new_item_from_stock(menu, _("Info"), PIDGIN_STOCK_INFO, 1618 button = pidgin_new_item_from_stock(menu, _("Info"), PIDGIN_STOCK_TOOLBAR_USER_INFO,
1619 G_CALLBACK(menu_chat_info_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); 1619 G_CALLBACK(menu_chat_info_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
1620 1620
1621 if (gc == NULL) 1621 if (gc == NULL)
1622 gtk_widget_set_sensitive(button, FALSE); 1622 gtk_widget_set_sensitive(button, FALSE);
1623 1623
2693 { 2693 {
2694 /* Conversation menu */ 2694 /* Conversation menu */
2695 { N_("/_Conversation"), NULL, NULL, 0, "<Branch>", NULL }, 2695 { N_("/_Conversation"), NULL, NULL, 0, "<Branch>", NULL },
2696 2696
2697 { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, 2697 { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb,
2698 0, "<StockItem>", PIDGIN_STOCK_IM }, 2698 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
2699 2699
2700 { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL }, 2700 { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL },
2701 2701
2702 { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0, 2702 { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0,
2703 "<StockItem>", GTK_STOCK_FIND }, 2703 "<StockItem>", GTK_STOCK_FIND },
2710 2710
2711 { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_FILE_TRANSFER }, 2711 { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_FILE_TRANSFER },
2712 { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, 2712 { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb,
2713 0, "<Item>", NULL }, 2713 0, "<Item>", NULL },
2714 { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, 2714 { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0,
2715 "<StockItem>", PIDGIN_STOCK_INFO }, 2715 "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO },
2716 { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, 2716 { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0,
2717 "<Item>", NULL }, 2717 "<Item>", NULL },
2718 { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL }, 2718 { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL },
2719 2719
2720 { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL }, 2720 { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL },
3043 3043
3044 if (!im || (gaim_conv_im_get_typing_state(im) == GAIM_NOT_TYPING)) 3044 if (!im || (gaim_conv_im_get_typing_state(im) == GAIM_NOT_TYPING))
3045 return; 3045 return;
3046 3046
3047 if (gaim_conv_im_get_typing_state(im) == GAIM_TYPING) { 3047 if (gaim_conv_im_get_typing_state(im) == GAIM_TYPING) {
3048 stock_id = PIDGIN_STOCK_TYPING; 3048 stock_id = PIDGIN_STOCK_TOOLBAR_TYPING;
3049 tooltip = _("User is typing..."); 3049 tooltip = _("User is typing...");
3050 } else { 3050 } else {
3051 stock_id = PIDGIN_STOCK_TYPED; 3051 stock_id = PIDGIN_STOCK_TYPED;
3052 tooltip = _("User has typed something and stopped"); 3052 tooltip = _("User has typed something and stopped");
3053 } 3053 }
3934 PidginConversation *gtkconv = data; 3934 PidginConversation *gtkconv = data;
3935 3935
3936 g_return_if_fail(menu != NULL); 3936 g_return_if_fail(menu != NULL);
3937 g_return_if_fail(gtkconv != NULL); 3937 g_return_if_fail(gtkconv != NULL);
3938 3938
3939 menuitem = pidgin_new_item_from_stock(NULL, _("_Send"), PIDGIN_STOCK_SEND, 3939 menuitem = pidgin_new_item_from_stock(NULL, _("_Send"), NULL,
3940 G_CALLBACK(send_menu_cb), gtkconv, 3940 G_CALLBACK(send_menu_cb), gtkconv,
3941 0, 0, NULL); 3941 0, 0, NULL);
3942 if (gtk_text_buffer_get_char_count(imhtml->text_buffer) == 0) 3942 if (gtk_text_buffer_get_char_count(imhtml->text_buffer) == 0)
3943 gtk_widget_set_sensitive(menuitem, FALSE); 3943 gtk_widget_set_sensitive(menuitem, FALSE);
3944 gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, 0); 3944 gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, 0);