From: Richard L. <rl...@us...> - 2005-08-30 05:54:06
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10738/src Modified Files: gtkstock.c Log Message: Icon Updates: 1. Use GTK+ stock icons wherever possible. 2. Tracked (via the GNOME tracker) the creators of a couple GTK+ stock icons we copied and added them to COPYRIGHT. 3. Adding several icons from http://gnome-look.org/content/show.php?content=22348 - I've modified the colors on op.png and voice.png. - I'd like to thank "Lokheed", the creator of these icons, for the nice work. - FYI, the gnome-look.org domain seems broken for me now, I pulled the URL out of my logs for this commit message. 4. Adding a new blocked.png and ignored.png that Erick Hamness made at my request. Thanks Erick. Index: gtkstock.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkstock.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -p -r1.4 -r1.5 --- gtkstock.c 15 Aug 2005 06:52:45 -0000 1.4 +++ gtkstock.c 30 Aug 2005 05:53:56 -0000 1.5 @@ -38,11 +38,15 @@ static struct StockIcon { { GAIM_STOCK_ABOUT, "buttons", "about_menu.png" }, { GAIM_STOCK_ACCOUNTS, "buttons", "accounts.png" }, +#if GTK_CHECK_VERSION(2,6,0) + { GAIM_STOCK_ALIAS, NULL, GTK_STOCK_EDIT }, +#else { GAIM_STOCK_ALIAS, "buttons", "edit.png" }, +#endif { GAIM_STOCK_BGCOLOR, "buttons", "change-bgcolor-small.png" }, { GAIM_STOCK_BLOCK, NULL, GTK_STOCK_STOP }, { GAIM_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, - { GAIM_STOCK_CLEAR, "buttons", "clear.png" }, + { GAIM_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, { GAIM_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, { GAIM_STOCK_DIALOG_AUTH, "dialogs", "gaim_auth.png" }, { GAIM_STOCK_DIALOG_COOL, "dialogs", "gaim_cool.png" }, @@ -51,7 +55,11 @@ static struct StockIcon { GAIM_STOCK_DIALOG_QUESTION, "dialogs", "gaim_question.png" }, { GAIM_STOCK_DIALOG_WARNING, "dialogs", "gaim_warning.png" }, { GAIM_STOCK_FGCOLOR, "buttons", "change-fgcolor-small.png" }, +#if GTK_CHECK_VERSION(2,6,0) + { GAIM_STOCK_EDIT, NULL, GTK_STOCK_EDIT }, +#else { GAIM_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 }, @@ -64,12 +72,20 @@ static struct StockIcon { GAIM_STOCK_IGNORE, NULL, GTK_STOCK_DIALOG_ERROR }, { GAIM_STOCK_IM, "buttons", "send-im.png" }, { GAIM_STOCK_IMAGE, "buttons", "insert-image-small.png" }, - { GAIM_STOCK_INFO, "icons", "info.png", }, +#if GTK_CHECK_VERSION(2,8,0) + { GAIM_STOCK_INFO, NULL, GTK_STOCK_INFO }, +#else + { GAIM_STOCK_INFO, "icons", "info.png" }, +#endif { GAIM_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO }, { GAIM_STOCK_LINK, "buttons", "insert-link-small.png" }, { GAIM_STOCK_LOGO, "gaim", "logo.png" }, { 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" }, +#endif { GAIM_STOCK_OPEN_MAIL, NULL, GTK_STOCK_JUMP_TO }, { GAIM_STOCK_SEND, "buttons", "send-im.png" }, { GAIM_STOCK_SIGN_ON, NULL, GTK_STOCK_EXECUTE }, |