# HG changeset patch # User Sean Egan # Date 1170677598 0 # Node ID 442128853bdbec64c61cc93397d3808cd6c2662e # Parent dad51c0e3bc69e5024a6df67891cda5036ce7833 toolbar/menu icons. reduce the imhtmltoolbar spacing. more gaimstock pruning diff -r dad51c0e3bc6 -r 442128853bdb configure.ac --- a/configure.ac Mon Feb 05 10:04:31 2007 +0000 +++ b/configure.ac Mon Feb 05 12:13:18 2007 +0000 @@ -1926,6 +1926,9 @@ pidgin/pixmaps/status/22/scalable/Makefile pidgin/pixmaps/status/32/Makefile pidgin/pixmaps/status/32/scalable/Makefile + pidgin/pixmaps/toolbar/Makefile + pidgin/pixmaps/toolbar/16/Makefile + pidgin/pixmaps/toolbar/16/scalable/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/gestures/Makefile diff -r dad51c0e3bc6 -r 442128853bdb pidgin/gaimstock.c --- a/pidgin/gaimstock.c Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/gaimstock.c Mon Feb 05 12:13:18 2007 +0000 @@ -37,14 +37,12 @@ } const stock_icons[] = { { PIDGIN_STOCK_ABOUT, "buttons", "about_menu.png" }, - { PIDGIN_STOCK_ACCOUNTS, "buttons", "accounts.png" }, { PIDGIN_STOCK_ACTION, NULL, GTK_STOCK_EXECUTE }, #if GTK_CHECK_VERSION(2,6,0) { PIDGIN_STOCK_ALIAS, NULL, GTK_STOCK_EDIT }, #else { PIDGIN_STOCK_ALIAS, "buttons", "edit.png" }, #endif - { PIDGIN_STOCK_BGCOLOR, "buttons", "change-bgcolor-small.png" }, { PIDGIN_STOCK_BLOCK, NULL, GTK_STOCK_STOP }, { PIDGIN_STOCK_UNBLOCK, NULL, GTK_STOCK_STOP /* XXX: */ }, { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, @@ -78,54 +76,32 @@ { PIDGIN_STOCK_ICON_ONLINE, "icons", "online.png" }, { PIDGIN_STOCK_ICON_ONLINE_MSG, "icons", "msgunread.png" }, { PIDGIN_STOCK_IGNORE, NULL, GTK_STOCK_DIALOG_ERROR }, - { PIDGIN_STOCK_IM, "buttons", "send-im.png" }, - { PIDGIN_STOCK_IMAGE, "buttons", "insert-image-small.png" }, -#if GTK_CHECK_VERSION(2,8,0) - { PIDGIN_STOCK_INFO, NULL, GTK_STOCK_INFO }, -#else - { PIDGIN_STOCK_INFO, "buttons", "info.png" }, -#endif { PIDGIN_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO }, - { PIDGIN_STOCK_LINK, "buttons", "insert-link-small.png" }, - { PIDGIN_STOCK_LOG, NULL, GTK_STOCK_DND_MULTIPLE }, { PIDGIN_STOCK_MODIFY, NULL, GTK_STOCK_PREFERENCES }, #if GTK_CHECK_VERSION(2,6,0) { PIDGIN_STOCK_PAUSE, NULL, GTK_STOCK_MEDIA_PAUSE }, #else { PIDGIN_STOCK_PAUSE, "buttons", "pause.png" }, #endif - { PIDGIN_STOCK_PENDING, "buttons", "send-im.png" }, -#if GTK_CHECK_VERSION(2,6,0) - { PIDGIN_STOCK_PLUGIN, NULL, GTK_STOCK_DISCONNECT }, -#else - { PIDGIN_STOCK_PLUGIN, "icons", "stock_disconnect_16.png" }, -#endif { PIDGIN_STOCK_POUNCE, NULL, GTK_STOCK_REDO }, { PIDGIN_STOCK_OPEN_MAIL, NULL, GTK_STOCK_JUMP_TO }, - { PIDGIN_STOCK_SEND, "buttons", "send-im.png" }, { PIDGIN_STOCK_SIGN_ON, NULL, GTK_STOCK_EXECUTE }, { PIDGIN_STOCK_SIGN_OFF, NULL, GTK_STOCK_CLOSE }, - { PIDGIN_STOCK_SMILEY, "buttons", "insert-smiley-small.png" }, - { PIDGIN_STOCK_TEXT_BIGGER, "buttons", "text_bigger.png" }, - { PIDGIN_STOCK_TEXT_NORMAL, "buttons", "text_normal.png" }, - { PIDGIN_STOCK_TEXT_SMALLER, "buttons", "text_smaller.png" }, { PIDGIN_STOCK_TYPED, "gaim", "typed.png" }, - { PIDGIN_STOCK_TYPING, "gaim", "typing.png" }, - { PIDGIN_STOCK_VOICE_CHAT, "gaim", "phone.png" }, { PIDGIN_STOCK_UPLOAD, NULL, GTK_STOCK_GO_UP }, }; static const GtkStockItem stock_items[] = { - { PIDGIN_STOCK_ALIAS, N_("_Alias"), 0, 0, NULL }, - { PIDGIN_STOCK_CHAT, N_("_Join"), 0, 0, NULL }, - { PIDGIN_STOCK_CLOSE_TABS, N_("Close _tabs"), 0, 0, NULL }, - { PIDGIN_STOCK_IM, N_("I_M"), 0, 0, NULL }, - { PIDGIN_STOCK_INFO, N_("_Get Info"), 0, 0, NULL }, - { PIDGIN_STOCK_INVITE, N_("_Invite"), 0, 0, NULL }, - { PIDGIN_STOCK_MODIFY, N_("_Modify"), 0, 0, NULL }, - { PIDGIN_STOCK_OPEN_MAIL, N_("_Open Mail"), 0, 0, NULL }, - { PIDGIN_STOCK_PAUSE, N_("_Pause"), 0, 0, NULL }, + { PIDGIN_STOCK_ALIAS, N_("_Alias"), 0, 0, NULL }, + { PIDGIN_STOCK_CHAT, N_("_Join"), 0, 0, NULL }, + { PIDGIN_STOCK_CLOSE_TABS, N_("Close _tabs"), 0, 0, NULL }, + { PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("I_M"), 0, 0, NULL }, + { PIDGIN_STOCK_TOOLBAR_USER_INFO, N_("_Get Info"), 0, 0, NULL }, + { PIDGIN_STOCK_INVITE, N_("_Invite"), 0, 0, NULL }, + { PIDGIN_STOCK_MODIFY, N_("_Modify"), 0, 0, NULL }, + { PIDGIN_STOCK_OPEN_MAIL, N_("_Open Mail"), 0, 0, NULL }, + { PIDGIN_STOCK_PAUSE, N_("_Pause"), 0, 0, NULL }, }; static struct SizedStockIcon { @@ -170,6 +146,19 @@ { PIDGIN_STOCK_ANIMATION_TYPING1, "animations", "typing1.png",TRUE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_ANIMATION_TYPING2, "animations", "typing2.png",TRUE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_ANIMATION_TYPING3, "animations", "typing3.png",TRUE, FALSE, FALSE, FALSE }, + + { PIDGIN_STOCK_TOOLBAR_ACCOUNTS, "toolbar", "accounts.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_BGCOLOR, "toolbar", "change-bgcolor.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_FGCOLOR, "toolbar", "change-fgcolor.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_SMILEY, "toolbar", "emote-select.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, "toolbar", "font-size-down.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_TEXT_LARGER, "toolbar", "font-size-up.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "toolbar", "insert-image.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_INSERT_LINK, "toolbar", "insert-link.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, "toolbar", "message-new.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_PLUGINS, "toolbar", "plugins.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_PENDING, "status", "message-pending.png", TRUE, FALSE, FALSE, FALSE }, }; static gchar * @@ -207,6 +196,18 @@ gtk_icon_source_set_state_wildcarded(source, TRUE); gtk_icon_set_add_source(iconset, source); gtk_icon_source_free(source); + + if (sizeid == gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)) { + source = gtk_icon_source_new(); + gtk_icon_source_set_filename(source, filename); + gtk_icon_source_set_direction_wildcarded(source, TRUE); + gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU); + gtk_icon_source_set_size_wildcarded(source, FALSE); + gtk_icon_source_set_state_wildcarded(source, TRUE); + gtk_icon_set_add_source(iconset, source); + gtk_icon_source_free(source); + } + g_free(filename); } diff -r dad51c0e3bc6 -r 442128853bdb pidgin/gaimstock.h --- a/pidgin/gaimstock.h Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/gaimstock.h Mon Feb 05 12:13:18 2007 +0000 @@ -32,11 +32,9 @@ /**************************************************************************/ /*@{*/ #define PIDGIN_STOCK_ABOUT "pidgin-about" -#define PIDGIN_STOCK_ACCOUNTS "pidgin-accounts" #define PIDGIN_STOCK_ACTION "pidgin-action" #define PIDGIN_STOCK_ALIAS "pidgin-alias" #define PIDGIN_STOCK_AWAY "pidgin-away" -#define PIDGIN_STOCK_BGCOLOR "pidgin-bgcolor" #define PIDGIN_STOCK_BLOCK "pidgin-block" #define PIDGIN_STOCK_UNBLOCK "pidgin-unblock" #define PIDGIN_STOCK_CHAT "pidgin-chat" @@ -58,29 +56,16 @@ #define PIDGIN_STOCK_ICON_ONLINE "pidgin-icon-online" #define PIDGIN_STOCK_ICON_ONLINE_MSG "pidgin-icon-online-msg" #define PIDGIN_STOCK_IGNORE "pidgin-ignore" -#define PIDGIN_STOCK_IM "pidgin-im" -#define PIDGIN_STOCK_IMAGE "pidgin-image" -#define PIDGIN_STOCK_INFO "pidgin-info" #define PIDGIN_STOCK_INVITE "pidgin-invite" -#define PIDGIN_STOCK_LINK "pidgin-link" -#define PIDGIN_STOCK_LOG "pidgin-log" #define PIDGIN_STOCK_MODIFY "pidgin-modify" #define PIDGIN_STOCK_OPEN_MAIL "pidgin-stock-open-mail" #define PIDGIN_STOCK_PAUSE "pidgin-pause" -#define PIDGIN_STOCK_PENDING "pidgin-pending" -#define PIDGIN_STOCK_PLUGIN "pidgin-plugin" #define PIDGIN_STOCK_POUNCE "pidgin-pounce" -#define PIDGIN_STOCK_SEND "pidgin-send" #define PIDGIN_STOCK_SIGN_OFF "pidgin-sign-off" #define PIDGIN_STOCK_SIGN_ON "pidgin-sign-on" -#define PIDGIN_STOCK_SMILEY "pidgin-smiley" -#define PIDGIN_STOCK_TEXT_BIGGER "pidgin-text-bigger" #define PIDGIN_STOCK_TEXT_NORMAL "pidgin-text-normal" -#define PIDGIN_STOCK_TEXT_SMALLER "pidgin-text-smaller" #define PIDGIN_STOCK_TYPED "pidgin-typed" -#define PIDGIN_STOCK_TYPING "pidgin-typing" #define PIDGIN_STOCK_UPLOAD "pidgin-upload" -#define PIDGIN_STOCK_VOICE_CHAT "pidgin-voice-chat" /* Status icons */ #define PIDGIN_STOCK_STATUS_AVAILABLE "pidgin-status-available" @@ -119,6 +104,20 @@ #define PIDGIN_STOCK_ANIMATION_TYPING2 "pidgin-anim-typing2" #define PIDGIN_STOCK_ANIMATION_TYPING3 "pidgin-anim-typing3" +/* Toolbar (and menu) icons */ +#define PIDGIN_STOCK_TOOLBAR_ACCOUNTS "pidgin-accounts" +#define PIDGIN_STOCK_TOOLBAR_BGCOLOR "pidgin-bgcolor" +#define PIDGIN_STOCK_TOOLBAR_FGCOLOR "pidgin-fgcolor" +#define PIDGIN_STOCK_TOOLBAR_SMILEY "pidgin-smiley" +#define PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER "pidgin-text-smaller" +#define PIDGIN_STOCK_TOOLBAR_TEXT_LARGER "pidgin-text-larger" +#define PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE "pidgin-insert-image" +#define PIDGIN_STOCK_TOOLBAR_INSERT_LINK "pidgin-insert-link" +#define PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW "pidgin-message-new" +#define PIDGIN_STOCK_TOOLBAR_PLUGINS "pidgin-plugins" +#define PIDGIN_STOCK_TOOLBAR_TYPING "pidgin-typing" +#define PIDGIN_STOCK_TOOLBAR_USER_INFO "pidgin-info" +#define PIDGIN_STOCK_TOOLBAR_PENDING "pidgin-pending" /*@}*/ /** diff -r dad51c0e3bc6 -r 442128853bdb pidgin/gtkblist.c --- a/pidgin/gtkblist.c Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/gtkblist.c Mon Feb 05 12:13:18 2007 +0000 @@ -1058,10 +1058,10 @@ } if (prpl_info && prpl_info->get_info) { - pidgin_new_item_from_stock(menu, _("Get _Info"), PIDGIN_STOCK_INFO, + pidgin_new_item_from_stock(menu, _("Get _Info"), PIDGIN_STOCK_TOOLBAR_USER_INFO, G_CALLBACK(gtk_blist_menu_info_cb), buddy, 0, 0, NULL); } - pidgin_new_item_from_stock(menu, _("I_M"), PIDGIN_STOCK_IM, + pidgin_new_item_from_stock(menu, _("I_M"), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(gtk_blist_menu_im_cb), buddy, 0, 0, NULL); if (prpl_info && prpl_info->send_file) { if (!prpl_info->can_receive_file || @@ -1078,7 +1078,7 @@ G_CALLBACK(gtk_blist_menu_bp_cb), buddy, 0, 0, NULL); if(((GaimBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) { - pidgin_new_item_from_stock(menu, _("View _Log"), PIDGIN_STOCK_LOG, + pidgin_new_item_from_stock(menu, _("View _Log"), NULL, G_CALLBACK(gtk_blist_menu_showlog_cb), contact, 0, 0, NULL); } else if (!sub) { @@ -1181,7 +1181,7 @@ G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL); pidgin_new_check_item(menu, _("Auto-Join"), G_CALLBACK(gtk_blist_menu_autojoin_cb), node, autojoin); - pidgin_new_item_from_stock(menu, _("View _Log"), PIDGIN_STOCK_LOG, + pidgin_new_item_from_stock(menu, _("View _Log"), NULL, G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL); pidgin_append_blist_node_proto_menu(menu, c->account->gc, node); @@ -1204,7 +1204,7 @@ menu = gtk_menu_new(); - pidgin_new_item_from_stock(menu, _("View _Log"), PIDGIN_STOCK_LOG, + pidgin_new_item_from_stock(menu, _("View _Log"), NULL, G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL); @@ -2716,9 +2716,9 @@ { /* Buddies menu */ { N_("/_Buddies"), NULL, NULL, 0, "", NULL }, - { N_("/Buddies/New Instant _Message..."), "M", pidgindialogs_im, 0, "", PIDGIN_STOCK_IM }, + { N_("/Buddies/New Instant _Message..."), "M", pidgindialogs_im, 0, "", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, { N_("/Buddies/Join a _Chat..."), "C", pidgin_blist_joinchat_show, 0, "", NULL }, - { N_("/Buddies/Get User _Info..."), "I", pidgindialogs_info, 0, "", PIDGIN_STOCK_INFO }, + { N_("/Buddies/Get User _Info..."), "I", pidgindialogs_info, 0, "", PIDGIN_STOCK_TOOLBAR_USER_INFO }, { N_("/Buddies/View User _Log..."), "L", pidgindialogs_log, 0, "", NULL }, { "/Buddies/sep1", NULL, NULL, 0, "", NULL }, { N_("/Buddies/Show _Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "", NULL }, @@ -2740,7 +2740,7 @@ /* Tools */ { N_("/_Tools"), NULL, NULL, 0, "", NULL }, { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "", NULL }, - { N_("/Tools/Plu_gins"), "U", pidgin_plugin_dialog_show, 0, "", PIDGIN_STOCK_PLUGIN }, + { N_("/Tools/Plu_gins"), "U", pidgin_plugin_dialog_show, 0, "", PIDGIN_STOCK_TOOLBAR_PLUGINS }, { N_("/Tools/Pr_eferences"), "P", pidgin_prefs_show, 0, "", GTK_STOCK_PREFERENCES }, { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "", NULL }, { "/Tools/sep2", NULL, NULL, 0, "", NULL }, @@ -3567,7 +3567,8 @@ if(tooltip_text->len > 0) { /* get rid of the last newline */ g_string_truncate(tooltip_text, tooltip_text->len -1); - img = gtk_image_new_from_stock(PIDGIN_STOCK_PENDING, GTK_ICON_SIZE_MENU); + img = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_PENDING, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); gtkblist->menutrayicon = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(gtkblist->menutrayicon), img); diff -r dad51c0e3bc6 -r 442128853bdb pidgin/gtkconv.c --- a/pidgin/gtkconv.c Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/gtkconv.c Mon Feb 05 12:13:18 2007 +0000 @@ -1576,7 +1576,7 @@ menu = gtk_menu_new(); if (!is_me) { - button = pidgin_new_item_from_stock(menu, _("IM"), PIDGIN_STOCK_IM, + button = pidgin_new_item_from_stock(menu, _("IM"), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(menu_chat_im_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); if (gc == NULL) @@ -1615,7 +1615,7 @@ } if (prpl_info && (prpl_info->get_info || prpl_info->get_cb_info)) { - button = pidgin_new_item_from_stock(menu, _("Info"), PIDGIN_STOCK_INFO, + button = pidgin_new_item_from_stock(menu, _("Info"), PIDGIN_STOCK_TOOLBAR_USER_INFO, G_CALLBACK(menu_chat_info_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); if (gc == NULL) @@ -2695,7 +2695,7 @@ { N_("/_Conversation"), NULL, NULL, 0, "", NULL }, { N_("/Conversation/New Instant _Message..."), "M", menu_new_conv_cb, - 0, "", PIDGIN_STOCK_IM }, + 0, "", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, { "/Conversation/sep0", NULL, NULL, 0, "", NULL }, @@ -2712,7 +2712,7 @@ { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, 0, "", NULL }, { N_("/Conversation/_Get Info"), "O", menu_get_info_cb, 0, - "", PIDGIN_STOCK_INFO }, + "", PIDGIN_STOCK_TOOLBAR_USER_INFO }, { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, "", NULL }, { N_("/Conversation/M_ore"), NULL, NULL, 0, "", NULL }, @@ -3045,7 +3045,7 @@ return; if (gaim_conv_im_get_typing_state(im) == GAIM_TYPING) { - stock_id = PIDGIN_STOCK_TYPING; + stock_id = PIDGIN_STOCK_TOOLBAR_TYPING; tooltip = _("User is typing..."); } else { stock_id = PIDGIN_STOCK_TYPED; @@ -3936,7 +3936,7 @@ g_return_if_fail(menu != NULL); g_return_if_fail(gtkconv != NULL); - menuitem = pidgin_new_item_from_stock(NULL, _("_Send"), PIDGIN_STOCK_SEND, + menuitem = pidgin_new_item_from_stock(NULL, _("_Send"), NULL, G_CALLBACK(send_menu_cb), gtkconv, 0, 0, NULL); if (gtk_text_buffer_get_char_count(imhtml->text_buffer) == 0) diff -r dad51c0e3bc6 -r 442128853bdb pidgin/gtkdocklet.c --- a/pidgin/gtkdocklet.c Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/gtkdocklet.c Mon Feb 05 12:13:18 2007 +0000 @@ -531,7 +531,7 @@ pidgin_separator(menu); - menuitem = pidgin_new_item_from_stock(menu, _("New Message..."), PIDGIN_STOCK_IM, G_CALLBACK(pidgindialogs_im), NULL, 0, 0, NULL); + menuitem = pidgin_new_item_from_stock(menu, _("New Message..."), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(pidgindialogs_im), NULL, 0, 0, NULL); if (status == DOCKLET_STATUS_OFFLINE) gtk_widget_set_sensitive(menuitem, FALSE); @@ -540,8 +540,8 @@ pidgin_separator(menu); - pidgin_new_item_from_stock(menu, _("Accounts"), PIDGIN_STOCK_ACCOUNTS, G_CALLBACK(pidgin_accounts_window_show), NULL, 0, 0, NULL); - pidgin_new_item_from_stock(menu, _("Plugins"), PIDGIN_STOCK_PLUGIN, G_CALLBACK(pidgin_plugin_dialog_show), NULL, 0, 0, NULL); + pidgin_new_item_from_stock(menu, _("Accounts"), NULL, G_CALLBACK(pidgin_accounts_window_show), NULL, 0, 0, NULL); + pidgin_new_item_from_stock(menu, _("Plugins"), NULL, G_CALLBACK(pidgin_plugin_dialog_show), NULL, 0, 0, NULL); pidgin_new_item_from_stock(menu, _("Preferences"), GTK_STOCK_PREFERENCES, G_CALLBACK(pidgin_prefs_show), NULL, 0, 0, NULL); pidgin_separator(menu); diff -r dad51c0e3bc6 -r 442128853bdb pidgin/gtkimhtmltoolbar.c --- a/pidgin/gtkimhtmltoolbar.c Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Mon Feb 05 12:13:18 2007 +0000 @@ -912,7 +912,7 @@ toolbar->tooltips = gtk_tooltips_new(); - gtk_box_set_spacing(GTK_BOX(toolbar), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(toolbar), 3); sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); /* Bold */ @@ -953,7 +953,7 @@ gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); /* Increase font size */ - button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TEXT_BIGGER); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_TEXT_LARGER); gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(toolbar->tooltips, button, @@ -965,7 +965,7 @@ toolbar->larger_size = button; /* Decrease font size */ - button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TEXT_SMALLER); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER); gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(toolbar->tooltips, button, @@ -994,7 +994,7 @@ toolbar->font = button; /* Foreground Color */ - button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_FGCOLOR); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_FGCOLOR); gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(toolbar->tooltips, button, @@ -1006,7 +1006,7 @@ toolbar->fgcolor = button; /* Background Color */ - button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_BGCOLOR); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_BGCOLOR); gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(toolbar->tooltips, button, @@ -1038,7 +1038,7 @@ gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); /* Insert Link */ - button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_LINK); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_INSERT_LINK); gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert link"), NULL); @@ -1048,7 +1048,7 @@ toolbar->link = button; /* Insert IM Image */ - button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_IMAGE); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE); gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert image"), NULL); @@ -1059,7 +1059,7 @@ toolbar->image = button; /* Insert Smiley */ - button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_SMILEY); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_SMILEY); gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert smiley"), NULL); diff -r dad51c0e3bc6 -r 442128853bdb pidgin/gtknotify.c --- a/pidgin/gtknotify.c Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/gtknotify.c Mon Feb 05 12:13:18 2007 +0000 @@ -795,10 +795,10 @@ button = gtk_button_new_from_stock(GTK_STOCK_ADD); break; case GAIM_NOTIFY_BUTTON_INFO: - button = gtk_button_new_from_stock(PIDGIN_STOCK_INFO); + button = gtk_button_new_from_stock(PIDGIN_STOCK_TOOLBAR_USER_INFO); break; case GAIM_NOTIFY_BUTTON_IM: - button = gtk_button_new_from_stock(PIDGIN_STOCK_IM); + button = gtk_button_new_from_stock(PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW); break; case GAIM_NOTIFY_BUTTON_JOIN: button = gtk_button_new_from_stock(PIDGIN_STOCK_CHAT); diff -r dad51c0e3bc6 -r 442128853bdb pidgin/gtkutils.c --- a/pidgin/gtkutils.c Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/gtkutils.c Mon Feb 05 12:13:18 2007 +0000 @@ -300,7 +300,7 @@ gtk_container_add (GTK_CONTAINER(button), bbox); - image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_stock(icon, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0); gtk_widget_show_all(bbox); @@ -372,7 +372,7 @@ g_signal_connect(G_OBJECT(menuitem), "activate", sf, data); if (icon != NULL) { - image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_stock(icon, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); } /* FIXME: this isn't right diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/Makefile.am --- a/pidgin/pixmaps/Makefile.am Mon Feb 05 10:04:31 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Mon Feb 05 12:13:18 2007 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = animations buddy_icons dialogs emblems emotes protocols status +SUBDIRS = animations buddy_icons dialogs emblems emotes protocols status toolbar EXTRA_DIST = \ about_menu.png \ diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/Makefile.am Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,19 @@ +SUBDIRS = scalable + +EXTRA_DIST = accounts.png \ + change-bgcolor.png \ + change-fgcolor.png \ + emote-select.png \ + font-size-down.png \ + font-size-up.png \ + insert-image.png \ + insert-link.png \ + message-new.png \ + plugins.png \ + typing.png \ + user-info.png \ + window-icon.png + +pidgintoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/16 +pidgintoolbarpix_DATA = $(EXTRA_DIST) + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/accounts.png Binary file pidgin/pixmaps/toolbar/16/accounts.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/change-bgcolor.png Binary file pidgin/pixmaps/toolbar/16/change-bgcolor.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/change-fgcolor.png Binary file pidgin/pixmaps/toolbar/16/change-fgcolor.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/emote-select.png Binary file pidgin/pixmaps/toolbar/16/emote-select.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/font-size-down.png Binary file pidgin/pixmaps/toolbar/16/font-size-down.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/font-size-up.png Binary file pidgin/pixmaps/toolbar/16/font-size-up.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/insert-image.png Binary file pidgin/pixmaps/toolbar/16/insert-image.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/insert-link.png Binary file pidgin/pixmaps/toolbar/16/insert-link.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/message-new.png Binary file pidgin/pixmaps/toolbar/16/message-new.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/plugins.png Binary file pidgin/pixmaps/toolbar/16/plugins.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/Makefile.am Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,14 @@ +EXTRA_DIST = accounts.svg \ + change-bgcolor.svg \ + change-fgcolor.svg \ + connect.svg \ + disconnect.svg \ + emote-select.svg \ + font-size-down.svg \ + font-size-up.svg \ + insert-image.svg \ + message-new.svg \ + plugins.svg \ + typing.svg \ + user-info.svg \ + window-icon.svg diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/accounts.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/accounts.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,118 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/change-bgcolor.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/change-bgcolor.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/change-fgcolor.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/change-fgcolor.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/connect.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/connect.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/disconnect.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/disconnect.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/emote-select.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/emote-select.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/font-size-down.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/font-size-down.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/font-size-up.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/font-size-up.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/insert-image.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/insert-image.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/message-new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/message-new.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/plugins.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/plugins.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/typing.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/typing.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,193 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/user-info.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/user-info.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/scalable/window-icon.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/window-icon.svg Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/typing.png Binary file pidgin/pixmaps/toolbar/16/typing.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/user-info.png Binary file pidgin/pixmaps/toolbar/16/user-info.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/16/window-icon.png Binary file pidgin/pixmaps/toolbar/16/window-icon.png has changed diff -r dad51c0e3bc6 -r 442128853bdb pidgin/pixmaps/toolbar/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/toolbar/Makefile.am Mon Feb 05 12:13:18 2007 +0000 @@ -0,0 +1,1 @@ +SUBDIRS = 16