Mercurial > pidgin
changeset 15508:23ca11f8a8c4
stock to pidgin
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 03 Feb 2007 08:56:16 +0000 |
| parents | 94031a2b0aaa |
| children | 567a499c3b06 |
| files | pidgin/gaimstock.c pidgin/gaimstock.h pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdebug.c pidgin/gtkdocklet-x11.c pidgin/gtkdocklet.c pidgin/gtkft.c pidgin/gtkimhtmltoolbar.c pidgin/gtknotify.c pidgin/gtkpounce.c pidgin/gtkrequest.c pidgin/gtkroomlist.c pidgin/gtksavedstatuses.c |
| diffstat | 15 files changed, 204 insertions(+), 225 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gaimstock.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gaimstock.c Sat Feb 03 08:56:16 2007 +0000 @@ -36,105 +36,96 @@ } const stock_icons[] = { - { GAIM_STOCK_ABOUT, "buttons", "about_menu.png" }, - { GAIM_STOCK_ACCOUNTS, "buttons", "accounts.png" }, - { GAIM_STOCK_ACTION, NULL, GTK_STOCK_EXECUTE }, + { 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) - { GAIM_STOCK_ALIAS, NULL, GTK_STOCK_EDIT }, + { PIDGIN_STOCK_ALIAS, NULL, GTK_STOCK_EDIT }, #else - { GAIM_STOCK_ALIAS, "buttons", "edit.png" }, + { PIDGIN_STOCK_ALIAS, "buttons", "edit.png" }, #endif - { GAIM_STOCK_BGCOLOR, "buttons", "change-bgcolor-small.png" }, - { GAIM_STOCK_BLOCK, NULL, GTK_STOCK_STOP }, - { GAIM_STOCK_UNBLOCK, NULL, GTK_STOCK_STOP /* XXX: */ }, - { GAIM_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, - { GAIM_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, - { GAIM_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, + { 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 }, + { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, + { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, #if GTK_CHECK_VERSION(2,6,0) - { GAIM_STOCK_CONNECT, NULL, GTK_STOCK_CONNECT }, + { PIDGIN_STOCK_CONNECT, NULL, GTK_STOCK_CONNECT }, #else - { GAIM_STOCK_CONNECT, "icons", "stock_connect_16.png" }, + { PIDGIN_STOCK_CONNECT, "icons", "stock_connect_16.png" }, #endif - { GAIM_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, - { GAIM_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, + { PIDGIN_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, + { PIDGIN_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, #if GTK_CHECK_VERSION(2,6,0) - { GAIM_STOCK_DISCONNECT, NULL, GTK_STOCK_DISCONNECT }, + { PIDGIN_STOCK_DISCONNECT, NULL, GTK_STOCK_DISCONNECT }, #else - { GAIM_STOCK_DISCONNECT, "icons", "stock_disconnect_16.png" }, + { PIDGIN_STOCK_DISCONNECT, "icons", "stock_disconnect_16.png" }, #endif - { GAIM_STOCK_FGCOLOR, "buttons", "change-fgcolor-small.png" }, + { PIDGIN_STOCK_FGCOLOR, "buttons", "change-fgcolor-small.png" }, #if GTK_CHECK_VERSION(2,6,0) - { GAIM_STOCK_EDIT, NULL, GTK_STOCK_EDIT }, + { PIDGIN_STOCK_EDIT, NULL, GTK_STOCK_EDIT }, #else - { GAIM_STOCK_EDIT, "buttons", "edit.png" }, + { PIDGIN_STOCK_EDIT, "buttons", "edit.png" }, #endif - { GAIM_STOCK_FILE_CANCELED, NULL, GTK_STOCK_CANCEL }, - { GAIM_STOCK_FILE_DONE, NULL, GTK_STOCK_APPLY }, - { GAIM_STOCK_FILE_TRANSFER, NULL, GTK_STOCK_REVERT_TO_SAVED }, - { GAIM_STOCK_ICON_AWAY, "icons", "away.png" }, - { GAIM_STOCK_ICON_AWAY_MSG, "icons", "msgpend.png" }, - { GAIM_STOCK_ICON_CONNECT, "icons", "connect.png" }, - { GAIM_STOCK_ICON_OFFLINE, "icons", "offline.png" }, - { GAIM_STOCK_ICON_ONLINE, "icons", "online.png" }, - { GAIM_STOCK_ICON_ONLINE_MSG, "icons", "msgunread.png" }, - { GAIM_STOCK_IGNORE, NULL, GTK_STOCK_DIALOG_ERROR }, - { GAIM_STOCK_IM, "buttons", "send-im.png" }, - { GAIM_STOCK_IMAGE, "buttons", "insert-image-small.png" }, + { PIDGIN_STOCK_FILE_CANCELED, NULL, GTK_STOCK_CANCEL }, + { PIDGIN_STOCK_FILE_DONE, NULL, GTK_STOCK_APPLY }, + { PIDGIN_STOCK_FILE_TRANSFER, NULL, GTK_STOCK_REVERT_TO_SAVED }, + { PIDGIN_STOCK_ICON_AWAY, "icons", "away.png" }, + { PIDGIN_STOCK_ICON_AWAY_MSG, "icons", "msgpend.png" }, + { PIDGIN_STOCK_ICON_CONNECT, "icons", "connect.png" }, + { PIDGIN_STOCK_ICON_OFFLINE, "icons", "offline.png" }, + { 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) - { GAIM_STOCK_INFO, NULL, GTK_STOCK_INFO }, + { PIDGIN_STOCK_INFO, NULL, GTK_STOCK_INFO }, #else - { GAIM_STOCK_INFO, "buttons", "info.png" }, -#endif - { GAIM_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO }, - { GAIM_STOCK_LINK, "buttons", "insert-link-small.png" }, - { GAIM_STOCK_LOG, NULL, GTK_STOCK_DND_MULTIPLE }, - { GAIM_STOCK_MODIFY, NULL, GTK_STOCK_PREFERENCES }, -#if GTK_CHECK_VERSION(2,6,0) - { GAIM_STOCK_PAUSE, NULL, GTK_STOCK_MEDIA_PAUSE }, -#else - { GAIM_STOCK_PAUSE, "buttons", "pause.png" }, + { PIDGIN_STOCK_INFO, "buttons", "info.png" }, #endif - { GAIM_STOCK_PENDING, "buttons", "send-im.png" }, + { 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) - { GAIM_STOCK_PLUGIN, NULL, GTK_STOCK_DISCONNECT }, + { PIDGIN_STOCK_PAUSE, NULL, GTK_STOCK_MEDIA_PAUSE }, #else - { GAIM_STOCK_PLUGIN, "icons", "stock_disconnect_16.png" }, + { PIDGIN_STOCK_PAUSE, "buttons", "pause.png" }, #endif - { GAIM_STOCK_POUNCE, NULL, GTK_STOCK_REDO }, - { GAIM_STOCK_OPEN_MAIL, NULL, GTK_STOCK_JUMP_TO }, - { GAIM_STOCK_SEND, "buttons", "send-im.png" }, - { GAIM_STOCK_SIGN_ON, NULL, GTK_STOCK_EXECUTE }, - { GAIM_STOCK_SIGN_OFF, NULL, GTK_STOCK_CLOSE }, - { GAIM_STOCK_SMILEY, "buttons", "insert-smiley-small.png" }, - { GAIM_STOCK_TEXT_BIGGER, "buttons", "text_bigger.png" }, - { GAIM_STOCK_TEXT_NORMAL, "buttons", "text_normal.png" }, - { GAIM_STOCK_TEXT_SMALLER, "buttons", "text_smaller.png" }, - { GAIM_STOCK_TYPED, "gaim", "typed.png" }, - { GAIM_STOCK_TYPING, "gaim", "typing.png" }, - { GAIM_STOCK_VOICE_CHAT, "gaim", "phone.png" }, - { GAIM_STOCK_STATUS_INVISIBLE,"gaim", "status-invisible.png" }, - { GAIM_STOCK_STATUS_TYPING0, "gaim", "status-typing0.png" }, - { GAIM_STOCK_STATUS_TYPING1, "gaim", "status-typing1.png" }, - { GAIM_STOCK_STATUS_TYPING2, "gaim", "status-typing2.png" }, - { GAIM_STOCK_STATUS_TYPING3, "gaim", "status-typing3.png" }, - { GAIM_STOCK_STATUS_CONNECT0, "gaim", "status-connect0.png" }, - { GAIM_STOCK_STATUS_CONNECT1, "gaim", "status-connect1.png" }, - { GAIM_STOCK_STATUS_CONNECT2, "gaim", "status-connect2.png" }, - { GAIM_STOCK_STATUS_CONNECT3, "gaim", "status-connect3.png" }, - { GAIM_STOCK_UPLOAD, NULL, GTK_STOCK_GO_UP }, + { 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[] = { - { GAIM_STOCK_ALIAS, N_("_Alias"), 0, 0, NULL }, - { GAIM_STOCK_CHAT, N_("_Join"), 0, 0, NULL }, - { GAIM_STOCK_CLOSE_TABS, N_("Close _tabs"), 0, 0, NULL }, - { GAIM_STOCK_IM, N_("I_M"), 0, 0, NULL }, - { GAIM_STOCK_INFO, N_("_Get Info"), 0, 0, NULL }, - { GAIM_STOCK_INVITE, N_("_Invite"), 0, 0, NULL }, - { GAIM_STOCK_MODIFY, N_("_Modify"), 0, 0, NULL }, - { GAIM_STOCK_OPEN_MAIL, N_("_Open Mail"), 0, 0, NULL }, - { GAIM_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_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 }, }; static struct SizedStockIcon {
--- a/pidgin/gaimstock.h Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gaimstock.h Sat Feb 03 08:56:16 2007 +0000 @@ -24,75 +24,63 @@ */ #include <gtk/gtkstock.h> -#ifndef _GAIM_STOCK_H_ -#define _GAIM_STOCK_H_ +#ifndef _PIDGIN_STOCK_H_ +#define _PIDGIN_STOCK_H_ /**************************************************************************/ /** @name Stock images */ /**************************************************************************/ /*@{*/ -#define GAIM_STOCK_ABOUT "gaim-about" -#define GAIM_STOCK_ACCOUNTS "gaim-accounts" -#define GAIM_STOCK_ACTION "gaim-action" -#define GAIM_STOCK_ALIAS "gaim-alias" -#define GAIM_STOCK_AWAY "gaim-away" -#define GAIM_STOCK_BGCOLOR "gaim-bgcolor" -#define GAIM_STOCK_BLOCK "gaim-block" -#define GAIM_STOCK_UNBLOCK "gaim-unblock" -#define GAIM_STOCK_CHAT "gaim-chat" -#define GAIM_STOCK_CLEAR "gaim-clear" -#define GAIM_STOCK_CLOSE_TABS "gaim-close-tab" -#define GAIM_STOCK_CONNECT "gaim-connect" -#define GAIM_STOCK_DEBUG "gaim-debug" -#define GAIM_STOCK_DISCONNECT "gaim-disconnect" -#define GAIM_STOCK_DOWNLOAD "gaim-download" -#define GAIM_STOCK_EDIT "gaim-edit" -#define GAIM_STOCK_FGCOLOR "gaim-fgcolor" -#define GAIM_STOCK_FILE_CANCELED "gaim-file-canceled" -#define GAIM_STOCK_FILE_DONE "gaim-file-done" -#define GAIM_STOCK_FILE_TRANSFER "gaim-file-transfer" -#define GAIM_STOCK_ICON_AWAY "gaim-icon-away" -#define GAIM_STOCK_ICON_AWAY_MSG "gaim-icon-away-msg" -#define GAIM_STOCK_ICON_CONNECT "gaim-icon-away-connect" -#define GAIM_STOCK_ICON_OFFLINE "gaim-icon-offline" -#define GAIM_STOCK_ICON_ONLINE "gaim-icon-online" -#define GAIM_STOCK_ICON_ONLINE_MSG "gaim-icon-online-msg" -#define GAIM_STOCK_IGNORE "gaim-ignore" -#define GAIM_STOCK_IM "gaim-im" -#define GAIM_STOCK_IMAGE "gaim-image" -#define GAIM_STOCK_INFO "gaim-info" -#define GAIM_STOCK_INVITE "gaim-invite" -#define GAIM_STOCK_LINK "gaim-link" -#define GAIM_STOCK_LOG "gaim-log" -#define GAIM_STOCK_MODIFY "gaim-modify" -#define GAIM_STOCK_OPEN_MAIL "gaim-stock-open-mail" -#define GAIM_STOCK_PAUSE "gaim-pause" -#define GAIM_STOCK_PENDING "gaim-pending" -#define GAIM_STOCK_PLUGIN "gaim-plugin" -#define GAIM_STOCK_POUNCE "gaim-pounce" -#define GAIM_STOCK_SEND "gaim-send" -#define GAIM_STOCK_SIGN_OFF "gaim-sign-off" -#define GAIM_STOCK_SIGN_ON "gaim-sign-on" -#define GAIM_STOCK_SMILEY "gaim-smiley" -#define GAIM_STOCK_STATUS_ONLINE "gaim-status-online" -#define GAIM_STOCK_STATUS_AWAY "gaim-status-away" -#define GAIM_STOCK_STATUS_INVISIBLE "gaim-status-invisible" -#define GAIM_STOCK_STATUS_OFFLINE "gaim-status-offline" -#define GAIM_STOCK_STATUS_TYPING0 "gaim-status-typing0" -#define GAIM_STOCK_STATUS_TYPING1 "gaim-status-typing1" -#define GAIM_STOCK_STATUS_TYPING2 "gaim-status-typing2" -#define GAIM_STOCK_STATUS_TYPING3 "gaim-status-typing3" -#define GAIM_STOCK_STATUS_CONNECT0 "gaim-status-connect0" -#define GAIM_STOCK_STATUS_CONNECT1 "gaim-status-connect1" -#define GAIM_STOCK_STATUS_CONNECT2 "gaim-status-connect2" -#define GAIM_STOCK_STATUS_CONNECT3 "gaim-status-connect3" -#define GAIM_STOCK_TEXT_BIGGER "gaim-text-bigger" -#define GAIM_STOCK_TEXT_NORMAL "gaim-text-normal" -#define GAIM_STOCK_TEXT_SMALLER "gaim-text-smaller" -#define GAIM_STOCK_TYPED "gaim-typed" -#define GAIM_STOCK_TYPING "gaim-typing" -#define GAIM_STOCK_UPLOAD "gaim-upload" -#define GAIM_STOCK_VOICE_CHAT "gaim-voice-chat" +#define PIDGIN_STOCK_ABOUT "gaim-about" +#define PIDGIN_STOCK_ACCOUNTS "gaim-accounts" +#define PIDGIN_STOCK_ACTION "gaim-action" +#define PIDGIN_STOCK_ALIAS "gaim-alias" +#define PIDGIN_STOCK_AWAY "gaim-away" +#define PIDGIN_STOCK_BGCOLOR "gaim-bgcolor" +#define PIDGIN_STOCK_BLOCK "gaim-block" +#define PIDGIN_STOCK_UNBLOCK "gaim-unblock" +#define PIDGIN_STOCK_CHAT "gaim-chat" +#define PIDGIN_STOCK_CLEAR "gaim-clear" +#define PIDGIN_STOCK_CLOSE_TABS "gaim-close-tab" +#define PIDGIN_STOCK_CONNECT "gaim-connect" +#define PIDGIN_STOCK_DEBUG "gaim-debug" +#define PIDGIN_STOCK_DISCONNECT "gaim-disconnect" +#define PIDGIN_STOCK_DOWNLOAD "gaim-download" +#define PIDGIN_STOCK_EDIT "gaim-edit" +#define PIDGIN_STOCK_FGCOLOR "gaim-fgcolor" +#define PIDGIN_STOCK_FILE_CANCELED "gaim-file-canceled" +#define PIDGIN_STOCK_FILE_DONE "gaim-file-done" +#define PIDGIN_STOCK_FILE_TRANSFER "gaim-file-transfer" +#define PIDGIN_STOCK_ICON_AWAY "gaim-icon-away" +#define PIDGIN_STOCK_ICON_AWAY_MSG "gaim-icon-away-msg" +#define PIDGIN_STOCK_ICON_CONNECT "gaim-icon-away-connect" +#define PIDGIN_STOCK_ICON_OFFLINE "gaim-icon-offline" +#define PIDGIN_STOCK_ICON_ONLINE "gaim-icon-online" +#define PIDGIN_STOCK_ICON_ONLINE_MSG "gaim-icon-online-msg" +#define PIDGIN_STOCK_IGNORE "gaim-ignore" +#define PIDGIN_STOCK_IM "gaim-im" +#define PIDGIN_STOCK_IMAGE "gaim-image" +#define PIDGIN_STOCK_INFO "gaim-info" +#define PIDGIN_STOCK_INVITE "gaim-invite" +#define PIDGIN_STOCK_LINK "gaim-link" +#define PIDGIN_STOCK_LOG "gaim-log" +#define PIDGIN_STOCK_MODIFY "gaim-modify" +#define PIDGIN_STOCK_OPEN_MAIL "gaim-stock-open-mail" +#define PIDGIN_STOCK_PAUSE "gaim-pause" +#define PIDGIN_STOCK_PENDING "gaim-pending" +#define PIDGIN_STOCK_PLUGIN "gaim-plugin" +#define PIDGIN_STOCK_POUNCE "gaim-pounce" +#define PIDGIN_STOCK_SEND "gaim-send" +#define PIDGIN_STOCK_SIGN_OFF "gaim-sign-off" +#define PIDGIN_STOCK_SIGN_ON "gaim-sign-on" +#define PIDGIN_STOCK_SMILEY "gaim-smiley" +#define PIDGIN_STOCK_TEXT_BIGGER "gaim-text-bigger" +#define PIDGIN_STOCK_TEXT_NORMAL "gaim-text-normal" +#define PIDGIN_STOCK_TEXT_SMALLER "gaim-text-smaller" +#define PIDGIN_STOCK_TYPED "gaim-typed" +#define PIDGIN_STOCK_TYPING "gaim-typing" +#define PIDGIN_STOCK_UPLOAD "gaim-upload" +#define PIDGIN_STOCK_VOICE_CHAT "gaim-voice-chat" /* Status icons */ #define PIDGIN_STOCK_STATUS_AVAILABLE "pidgin-status-available" @@ -145,4 +133,4 @@ */ void pidgin_stock_init(void); -#endif /* _GAIM_STOCK_H_ */ +#endif /* _PIDGIN_STOCK_H_ */
--- a/pidgin/gtkaccount.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkaccount.c Sat Feb 03 08:56:16 2007 +0000 @@ -2301,7 +2301,7 @@ G_CALLBACK(add_account_cb), dialog); /* Modify button */ - button = gtk_button_new_from_stock(GAIM_STOCK_MODIFY); + button = gtk_button_new_from_stock(PIDGIN_STOCK_MODIFY); dialog->modify_button = button; gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); gtk_widget_set_sensitive(button, FALSE);
--- a/pidgin/gtkblist.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkblist.c Sat Feb 03 08:56:16 2007 +0000 @@ -703,7 +703,7 @@ data->window = gtk_dialog_new_with_buttons(_("Join a Chat"), NULL, GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GAIM_STOCK_CHAT, GTK_RESPONSE_OK, NULL); + PIDGIN_STOCK_CHAT, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); gtk_container_set_border_width(GTK_CONTAINER(data->window), GAIM_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); @@ -1007,7 +1007,7 @@ permitted = gaim_privacy_check(account, gaim_buddy_get_name(buddy)); pidgin_new_item_from_stock(menu, permitted ? _("_Block") : _("Un_block"), - GAIM_STOCK_BLOCK, G_CALLBACK(toggle_privacy), + PIDGIN_STOCK_BLOCK, G_CALLBACK(toggle_privacy), node, 0 ,0, NULL); } @@ -1057,31 +1057,31 @@ } if (prpl_info && prpl_info->get_info) { - pidgin_new_item_from_stock(menu, _("Get _Info"), GAIM_STOCK_INFO, + pidgin_new_item_from_stock(menu, _("Get _Info"), PIDGIN_STOCK_INFO, G_CALLBACK(gtk_blist_menu_info_cb), buddy, 0, 0, NULL); } - pidgin_new_item_from_stock(menu, _("I_M"), GAIM_STOCK_IM, + pidgin_new_item_from_stock(menu, _("I_M"), PIDGIN_STOCK_IM, G_CALLBACK(gtk_blist_menu_im_cb), buddy, 0, 0, NULL); if (prpl_info && prpl_info->send_file) { if (!prpl_info->can_receive_file || prpl_info->can_receive_file(buddy->account->gc, buddy->name)) { pidgin_new_item_from_stock(menu, _("_Send File"), - GAIM_STOCK_FILE_TRANSFER, + PIDGIN_STOCK_FILE_TRANSFER, G_CALLBACK(gtk_blist_menu_send_file_cb), buddy, 0, 0, NULL); } } - pidgin_new_item_from_stock(menu, _("Add Buddy _Pounce"), GAIM_STOCK_POUNCE, + pidgin_new_item_from_stock(menu, _("Add Buddy _Pounce"), PIDGIN_STOCK_POUNCE, 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"), GAIM_STOCK_LOG, + pidgin_new_item_from_stock(menu, _("View _Log"), PIDGIN_STOCK_LOG, G_CALLBACK(gtk_blist_menu_showlog_cb), contact, 0, 0, NULL); } else if (!sub) { - pidgin_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG, + pidgin_new_item_from_stock(menu, _("View _Log"), PIDGIN_STOCK_LOG, G_CALLBACK(gtk_blist_menu_showlog_cb), buddy, 0, 0, NULL); } @@ -1094,7 +1094,7 @@ if (((GaimBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) { pidgin_separator(menu); - pidgin_new_item_from_stock(menu, _("Alias..."), GAIM_STOCK_ALIAS, + pidgin_new_item_from_stock(menu, _("Alias..."), PIDGIN_STOCK_ALIAS, G_CALLBACK(gtk_blist_menu_alias_cb), contact, 0, 0, NULL); pidgin_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE, @@ -1103,7 +1103,7 @@ } else if (!sub || contact_expanded) { pidgin_separator(menu); - pidgin_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS, + pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS, G_CALLBACK(gtk_blist_menu_alias_cb), buddy, 0, 0, NULL); pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE, G_CALLBACK(pidgin_blist_remove_cb), buddy, @@ -1177,11 +1177,11 @@ autojoin = (gaim_blist_node_get_bool(node, "gtk-autojoin") || (gaim_blist_node_get_string(node, "gtk-autojoin") != NULL)); - pidgin_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT, + pidgin_new_item_from_stock(menu, _("_Join"), PIDGIN_STOCK_CHAT, 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"), GAIM_STOCK_LOG, + pidgin_new_item_from_stock(menu, _("View _Log"), PIDGIN_STOCK_LOG, G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL); pidgin_append_blist_node_proto_menu(menu, c->account->gc, node); @@ -1189,7 +1189,7 @@ pidgin_separator(menu); - pidgin_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS, + pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS, G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL); pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE, G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL); @@ -1204,13 +1204,13 @@ menu = gtk_menu_new(); - pidgin_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG, + pidgin_new_item_from_stock(menu, _("View _Log"), PIDGIN_STOCK_LOG, G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL); pidgin_separator(menu); - pidgin_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS, + pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS, G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL); pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE, G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL); @@ -2716,10 +2716,10 @@ { /* Buddies menu */ { N_("/_Buddies"), NULL, NULL, 0, "<Branch>", NULL }, - { N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgindialogs_im, 0, "<StockItem>", GAIM_STOCK_IM }, - { N_("/Buddies/Join a _Chat..."), "<CTL>C", pidgin_blist_joinchat_show, 0, "<StockItem>", GAIM_STOCK_CHAT }, - { N_("/Buddies/Get User _Info..."), "<CTL>I", pidgindialogs_info, 0, "<StockItem>", GAIM_STOCK_INFO }, - { N_("/Buddies/View User _Log..."), "<CTL>L", pidgindialogs_log, 0, "<StockItem>", GAIM_STOCK_LOG }, + { N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgindialogs_im, 0, "<StockItem>", PIDGIN_STOCK_IM }, + { N_("/Buddies/Join a _Chat..."), "<CTL>C", pidgin_blist_joinchat_show, 0, "<StockItem>", PIDGIN_STOCK_CHAT }, + { N_("/Buddies/Get User _Info..."), "<CTL>I", pidgindialogs_info, 0, "<StockItem>", PIDGIN_STOCK_INFO }, + { N_("/Buddies/View User _Log..."), "<CTL>L", pidgindialogs_log, 0, "<StockItem>", PIDGIN_STOCK_LOG }, { "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Buddies/Show _Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL }, { N_("/Buddies/Show _Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL }, @@ -2735,26 +2735,26 @@ /* Accounts menu */ { N_("/_Accounts"), NULL, NULL, 0, "<Branch>", NULL }, - { N_("/Accounts/Add\\/Edit"), "<CTL>A", pidgin_accounts_window_show, 0, "<StockItem>", GAIM_STOCK_ACCOUNTS }, + { N_("/Accounts/Add\\/Edit"), "<CTL>A", pidgin_accounts_window_show, 0, "<StockItem>", PIDGIN_STOCK_ACCOUNTS }, /* Tools */ { N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL }, - { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "<StockItem>", GAIM_STOCK_POUNCE }, - { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 0, "<StockItem>", GAIM_STOCK_PLUGIN }, + { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "<StockItem>", PIDGIN_STOCK_POUNCE }, + { N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_PLUGIN }, { N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES }, { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_DIALOG_ERROR }, { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, - { N_("/Tools/_File Transfers"), "<CTL>T", pidginxfer_dialog_show, 0, "<StockItem>", GAIM_STOCK_FILE_TRANSFER }, + { N_("/Tools/_File Transfers"), "<CTL>T", pidginxfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_FILE_TRANSFER }, { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<StockItem>", GTK_STOCK_INDEX }, - { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<StockItem>", GAIM_STOCK_LOG }, + { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<StockItem>", PIDGIN_STOCK_LOG }, { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, /* Help */ { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, - { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<StockItem>", GAIM_STOCK_DEBUG }, - { N_("/Help/_About"), NULL, pidgindialogs_about, 0, "<StockItem>", GAIM_STOCK_ABOUT }, + { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<StockItem>", PIDGIN_STOCK_DEBUG }, + { N_("/Help/_About"), NULL, pidgindialogs_about, 0, "<StockItem>", PIDGIN_STOCK_ABOUT }, }; /********************************************************* @@ -3553,7 +3553,7 @@ 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(GAIM_STOCK_PENDING, GTK_ICON_SIZE_MENU); + img = gtk_image_new_from_stock(PIDGIN_STOCK_PENDING, GTK_ICON_SIZE_MENU); gtkblist->menutrayicon = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(gtkblist->menutrayicon), img);
--- a/pidgin/gtkconv.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkconv.c Sat Feb 03 08:56:16 2007 +0000 @@ -846,7 +846,7 @@ _("Invite Buddy Into Chat Room"), GTK_WINDOW(gtkwin->window), 0, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GAIM_STOCK_INVITE, GTK_RESPONSE_OK, NULL); + PIDGIN_STOCK_INVITE, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(invite_dialog), GTK_RESPONSE_OK); @@ -1606,7 +1606,7 @@ menu = gtk_menu_new(); if (!is_me) { - button = pidgin_new_item_from_stock(menu, _("IM"), GAIM_STOCK_IM, + button = pidgin_new_item_from_stock(menu, _("IM"), PIDGIN_STOCK_IM, G_CALLBACK(menu_chat_im_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); if (gc == NULL) @@ -1618,7 +1618,7 @@ if (prpl_info && prpl_info->send_file) { button = pidgin_new_item_from_stock(menu, _("Send File"), - GAIM_STOCK_FILE_TRANSFER, G_CALLBACK(menu_chat_send_file_cb), + PIDGIN_STOCK_FILE_TRANSFER, G_CALLBACK(menu_chat_send_file_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); if (gc == NULL || prpl_info == NULL || @@ -1632,10 +1632,10 @@ if (gaim_conv_chat_is_user_ignored(GAIM_CONV_CHAT(conv), who)) - button = pidgin_new_item_from_stock(menu, _("Un-Ignore"), GAIM_STOCK_IGNORE, + button = pidgin_new_item_from_stock(menu, _("Un-Ignore"), PIDGIN_STOCK_IGNORE, G_CALLBACK(ignore_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); else - button = pidgin_new_item_from_stock(menu, _("Ignore"), GAIM_STOCK_IGNORE, + button = pidgin_new_item_from_stock(menu, _("Ignore"), PIDGIN_STOCK_IGNORE, G_CALLBACK(ignore_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); if (gc == NULL) @@ -1645,7 +1645,7 @@ } if (prpl_info && (prpl_info->get_info || prpl_info->get_cb_info)) { - button = pidgin_new_item_from_stock(menu, _("Info"), GAIM_STOCK_INFO, + button = pidgin_new_item_from_stock(menu, _("Info"), PIDGIN_STOCK_INFO, G_CALLBACK(menu_chat_info_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); if (gc == NULL) @@ -1655,7 +1655,7 @@ } if (prpl_info && prpl_info->get_cb_away) { - button = pidgin_new_item_from_stock(menu, _("Get Away Message"), GAIM_STOCK_AWAY, + button = pidgin_new_item_from_stock(menu, _("Get Away Message"), PIDGIN_STOCK_AWAY, G_CALLBACK(menu_chat_get_away_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); if (gc == NULL) @@ -2725,36 +2725,36 @@ { N_("/_Conversation"), NULL, NULL, 0, "<Branch>", NULL }, { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, - 0, "<StockItem>", GAIM_STOCK_IM }, + 0, "<StockItem>", PIDGIN_STOCK_IM }, { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0, "<StockItem>", GTK_STOCK_FIND }, - { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "<StockItem>", GAIM_STOCK_LOG }, + { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "<StockItem>", PIDGIN_STOCK_LOG }, { N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0, "<StockItem>", GTK_STOCK_SAVE_AS }, { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL }, - { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", GAIM_STOCK_FILE_TRANSFER }, + { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_FILE_TRANSFER }, { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, - 0, "<StockItem>", GAIM_STOCK_POUNCE }, + 0, "<StockItem>", PIDGIN_STOCK_POUNCE }, { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, - "<StockItem>", GAIM_STOCK_INFO }, + "<StockItem>", PIDGIN_STOCK_INFO }, { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, - "<StockItem>", GAIM_STOCK_INVITE }, + "<StockItem>", PIDGIN_STOCK_INVITE }, { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL }, { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Conversation/Al_ias..."), NULL, menu_alias_cb, 0, - "<StockItem>", GAIM_STOCK_EDIT }, + "<StockItem>", PIDGIN_STOCK_EDIT }, { N_("/Conversation/_Block..."), NULL, menu_block_cb, 0, - "<StockItem>", GAIM_STOCK_BLOCK }, + "<StockItem>", PIDGIN_STOCK_BLOCK }, { N_("/Conversation/_Unblock..."), NULL, menu_unblock_cb, 0, - "<StockItem>", GAIM_STOCK_UNBLOCK }, + "<StockItem>", PIDGIN_STOCK_UNBLOCK }, { N_("/Conversation/_Add..."), NULL, menu_add_remove_cb, 0, "<StockItem>", GTK_STOCK_ADD }, { N_("/Conversation/_Remove..."), NULL, menu_add_remove_cb, 0, @@ -2763,9 +2763,9 @@ { "/Conversation/sep3", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0, - "<StockItem>", GAIM_STOCK_LINK }, + "<StockItem>", PIDGIN_STOCK_LINK }, { N_("/Conversation/Insert Imag_e..."), NULL, menu_insert_image_cb, 0, - "<StockItem>", GAIM_STOCK_IMAGE }, + "<StockItem>", PIDGIN_STOCK_IMAGE }, { "/Conversation/sep4", NULL, NULL, 0, "<Separator>", NULL }, @@ -3094,10 +3094,10 @@ return; if (gaim_conv_im_get_typing_state(im) == GAIM_TYPING) { - stock_id = GAIM_STOCK_TYPING; + stock_id = PIDGIN_STOCK_TYPING; tooltip = _("User is typing..."); } else { - stock_id = GAIM_STOCK_TYPED; + stock_id = PIDGIN_STOCK_TYPED; tooltip = _("User has typed something and stopped"); } @@ -3988,7 +3988,7 @@ g_return_if_fail(menu != NULL); g_return_if_fail(gtkconv != NULL); - menuitem = pidgin_new_item_from_stock(NULL, _("_Send"), GAIM_STOCK_SEND, + menuitem = pidgin_new_item_from_stock(NULL, _("_Send"), PIDGIN_STOCK_SEND, G_CALLBACK(send_menu_cb), gtkconv, 0, 0, NULL); if (gtk_text_buffer_get_char_count(imhtml->text_buffer) == 0) @@ -7025,7 +7025,7 @@ _("Confirm close"), GTK_WINDOW(gtkwin->window), GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GAIM_STOCK_CLOSE_TABS, GTK_RESPONSE_OK, NULL); + PIDGIN_STOCK_CLOSE_TABS, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(warn_close_dialog), GTK_RESPONSE_OK);
--- a/pidgin/gtkdebug.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkdebug.c Sat Feb 03 08:56:16 2007 +0000 @@ -770,7 +770,7 @@ gtk_toolbar_insert_space(GTK_TOOLBAR(toolbar), -1); /* Pause */ - image = gtk_image_new_from_stock(GAIM_STOCK_PAUSE, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_stock(PIDGIN_STOCK_PAUSE, GTK_ICON_SIZE_MENU); gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, _("Pause"), _("Pause"),
--- a/pidgin/gtkdocklet-x11.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Sat Feb 03 08:56:16 2007 +0000 @@ -93,22 +93,22 @@ switch (icon) { case DOCKLET_STATUS_OFFLINE: - icon_name = GAIM_STOCK_ICON_OFFLINE; + icon_name = PIDGIN_STOCK_ICON_OFFLINE; break; case DOCKLET_STATUS_CONNECTING: - icon_name = GAIM_STOCK_ICON_CONNECT; + icon_name = PIDGIN_STOCK_ICON_CONNECT; break; case DOCKLET_STATUS_ONLINE: - icon_name = GAIM_STOCK_ICON_ONLINE; + icon_name = PIDGIN_STOCK_ICON_ONLINE; break; case DOCKLET_STATUS_ONLINE_PENDING: - icon_name = GAIM_STOCK_ICON_ONLINE_MSG; + icon_name = PIDGIN_STOCK_ICON_ONLINE_MSG; break; case DOCKLET_STATUS_AWAY: - icon_name = GAIM_STOCK_ICON_AWAY; + icon_name = PIDGIN_STOCK_ICON_AWAY; break; case DOCKLET_STATUS_AWAY_PENDING: - icon_name = GAIM_STOCK_ICON_AWAY_MSG; + icon_name = PIDGIN_STOCK_ICON_AWAY_MSG; break; }
--- a/pidgin/gtkdocklet.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkdocklet.c Sat Feb 03 08:56:16 2007 +0000 @@ -531,7 +531,7 @@ pidgin_separator(menu); - menuitem = pidgin_new_item_from_stock(menu, _("New Message..."), GAIM_STOCK_IM, G_CALLBACK(pidgindialogs_im), NULL, 0, 0, NULL); + menuitem = pidgin_new_item_from_stock(menu, _("New Message..."), PIDGIN_STOCK_IM, 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"), GAIM_STOCK_ACCOUNTS, G_CALLBACK(pidgin_accounts_window_show), NULL, 0, 0, NULL); - pidgin_new_item_from_stock(menu, _("Plugins"), GAIM_STOCK_PLUGIN, G_CALLBACK(pidgin_plugin_dialog_show), NULL, 0, 0, NULL); + 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, _("Preferences"), GTK_STOCK_PREFERENCES, G_CALLBACK(pidgin_prefs_show), NULL, 0, 0, NULL); pidgin_separator(menu);
--- a/pidgin/gtkft.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkft.c Sat Feb 03 08:56:16 2007 +0000 @@ -258,7 +258,7 @@ GdkPixbuf *pixbuf = NULL; pixbuf = gtk_widget_render_icon(xfer_dialog->window, - GAIM_STOCK_FILE_DONE, + PIDGIN_STOCK_FILE_DONE, GTK_ICON_SIZE_MENU, NULL); gtk_list_store_set(GTK_LIST_STORE(xfer_dialog->model), &data->iter, @@ -956,8 +956,8 @@ pixbuf = gtk_widget_render_icon(dialog->window, (type == GAIM_XFER_RECEIVE - ? GAIM_STOCK_DOWNLOAD - : GAIM_STOCK_UPLOAD), + ? PIDGIN_STOCK_DOWNLOAD + : PIDGIN_STOCK_UPLOAD), GTK_ICON_SIZE_MENU, NULL); gtk_list_store_append(dialog->model, &data->iter); @@ -1049,7 +1049,7 @@ update_title_progress(dialog); pixbuf = gtk_widget_render_icon(dialog->window, - GAIM_STOCK_FILE_CANCELED, + PIDGIN_STOCK_FILE_CANCELED, GTK_ICON_SIZE_MENU, NULL); if (gaim_xfer_is_canceled(xfer)) @@ -1110,7 +1110,7 @@ GdkPixbuf *pixbuf; pixbuf = gtk_widget_render_icon(dialog->window, - GAIM_STOCK_FILE_DONE, + PIDGIN_STOCK_FILE_DONE, GTK_ICON_SIZE_MENU, NULL); gtk_list_store_set(GTK_LIST_STORE(xfer_dialog->model), &data->iter,
--- a/pidgin/gtkimhtmltoolbar.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Sat Feb 03 08:56:16 2007 +0000 @@ -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(GAIM_STOCK_TEXT_BIGGER); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TEXT_BIGGER); 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(GAIM_STOCK_TEXT_SMALLER); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_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(GAIM_STOCK_FGCOLOR); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_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(GAIM_STOCK_BGCOLOR); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_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, @@ -1022,7 +1022,7 @@ gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); /* Reset Formatting */ - button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_CLEAR); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_CLEAR); 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(GAIM_STOCK_LINK); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_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(GAIM_STOCK_IMAGE); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_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(GAIM_STOCK_SMILEY); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_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);
--- a/pidgin/gtknotify.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtknotify.c Sat Feb 03 08:56:16 2007 +0000 @@ -328,7 +328,7 @@ _("Open All Messages"), GTK_RESPONSE_ACCEPT); button = gtk_dialog_add_button(GTK_DIALOG(dialog), - GAIM_STOCK_OPEN_MAIL, GTK_RESPONSE_YES); + PIDGIN_STOCK_OPEN_MAIL, GTK_RESPONSE_YES); /* Setup the dialog */ gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BOX_SPACE); @@ -795,16 +795,16 @@ button = gtk_button_new_from_stock(GTK_STOCK_ADD); break; case GAIM_NOTIFY_BUTTON_INFO: - button = gtk_button_new_from_stock(GAIM_STOCK_INFO); + button = gtk_button_new_from_stock(PIDGIN_STOCK_INFO); break; case GAIM_NOTIFY_BUTTON_IM: - button = gtk_button_new_from_stock(GAIM_STOCK_IM); + button = gtk_button_new_from_stock(PIDGIN_STOCK_IM); break; case GAIM_NOTIFY_BUTTON_JOIN: - button = gtk_button_new_from_stock(GAIM_STOCK_CHAT); + button = gtk_button_new_from_stock(PIDGIN_STOCK_CHAT); break; case GAIM_NOTIFY_BUTTON_INVITE: - button = gtk_button_new_from_stock(GAIM_STOCK_INVITE); + button = gtk_button_new_from_stock(PIDGIN_STOCK_INVITE); break; default: gaim_debug_warning("gtknotify", "Incorrect button type: %d\n", b->type);
--- a/pidgin/gtkpounce.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkpounce.c Sat Feb 03 08:56:16 2007 +0000 @@ -1360,7 +1360,7 @@ G_CALLBACK(pounces_manager_add_cb), dialog); /* Modify button */ - button = gtk_button_new_from_stock(GAIM_STOCK_MODIFY); + button = gtk_button_new_from_stock(PIDGIN_STOCK_MODIFY); dialog->modify_button = button; gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); gtk_widget_set_sensitive(button, FALSE);
--- a/pidgin/gtkrequest.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkrequest.c Sat Feb 03 08:56:16 2007 +0000 @@ -274,7 +274,7 @@ STOCK_ITEMIZE(_("Add"), GTK_STOCK_ADD); STOCK_ITEMIZE(_("Remove"), GTK_STOCK_REMOVE); STOCK_ITEMIZE(_("Save"), GTK_STOCK_SAVE); - STOCK_ITEMIZE(_("Alias"), GAIM_STOCK_ALIAS); + STOCK_ITEMIZE(_("Alias"), PIDGIN_STOCK_ALIAS); return text; }
--- a/pidgin/gtkroomlist.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtkroomlist.c Sat Feb 03 08:56:16 2007 +0000 @@ -303,7 +303,7 @@ info.room = room; menu = gtk_menu_new(); - pidgin_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT, + pidgin_new_item_from_stock(menu, _("_Join"), PIDGIN_STOCK_CHAT, G_CALLBACK(do_join_cb), &info, 0, 0, NULL); pidgin_new_item_from_stock(menu, _("_Add"), GTK_STOCK_ADD, G_CALLBACK(do_add_room_cb), &info, 0, 0, NULL); @@ -460,7 +460,7 @@ gtk_widget_show(dialog->add_button); /* join button */ - dialog->join_button = pidgin_pixbuf_button_from_stock(_("_Join"), GAIM_STOCK_CHAT, + dialog->join_button = pidgin_pixbuf_button_from_stock(_("_Join"), PIDGIN_STOCK_CHAT, PIDGIN_BUTTON_HORIZONTAL); gtk_box_pack_start(GTK_BOX(bbox), dialog->join_button, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(dialog->join_button), "clicked",
--- a/pidgin/gtksavedstatuses.c Sat Feb 03 08:52:00 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Sat Feb 03 08:56:16 2007 +0000 @@ -593,7 +593,7 @@ G_CALLBACK(status_window_add_cb), dialog); /* Modify button */ - button = gtk_button_new_from_stock(GAIM_STOCK_MODIFY); + button = gtk_button_new_from_stock(PIDGIN_STOCK_MODIFY); dialog->modify_button = button; gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); gtk_widget_set_sensitive(button, FALSE);