Mercurial > pidgin

changeset 11370:2c3fb4a0f785

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13595] 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. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Tue, 30 Aug 2005 05:53:56 +0000
parents ab0fa7cd61cc
children 6e02e20e3a58
files COPYRIGHT pixmaps/Makefile.am pixmaps/clear.png pixmaps/edit.png pixmaps/insert-link-small.png pixmaps/msgpend.png pixmaps/msgunread.png pixmaps/status/default/blocked.png pixmaps/status/default/dnd.png pixmaps/status/default/freeforchat.png pixmaps/status/default/gadu-gadu.png pixmaps/status/default/halfop.png pixmaps/status/default/ignored.png pixmaps/status/default/invisible.png pixmaps/status/default/jabber.png pixmaps/status/default/na.png pixmaps/status/default/napster.png pixmaps/status/default/notauthorized.png pixmaps/status/default/op.png pixmaps/status/default/voice.png pixmaps/status/default/zephyr.png pixmaps/text_bigger.png pixmaps/text_smaller.png src/gtkstock.c
diffstat 24 files changed, 22 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Tue Aug 30 05:21:58 2005 +0000
+++ b/COPYRIGHT	Tue Aug 30 05:53:56 2005 +0000
@@ -110,6 +110,7 @@
 Cole Kowalski
 Gary Kramlich
 Patrik Kullman
+Tuomas Kuosmanen
 Tero Kuusela
 Richard Laager
 Scott Lamb
@@ -124,6 +125,7 @@
 Nicolas Lichtmaier
 Artem Litvinovich
 Syd Logan
+Lokheed
 Norberto Lopes
 Uli Luckas
 Matthew Luckie
@@ -224,6 +226,7 @@
 Junichi Uekawa
 István Váradi
 Philip Van Hoof
+Kristof Vansant
 David Vermeille
 Sid Vicious
 Bjoern Voigt
--- a/pixmaps/Makefile.am	Tue Aug 30 05:21:58 2005 +0000
+++ b/pixmaps/Makefile.am	Tue Aug 30 05:53:56 2005 +0000
@@ -6,7 +6,6 @@
 		away.png			\
 		change-bgcolor-small.png	\
 		change-fgcolor-small.png	\
-		clear.png			\
 		connect.png			\
 		edit.png			\
 		gaim.png			\
@@ -69,7 +68,7 @@
 
 
 gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
-gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png clear.png edit.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
+gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
 
 gaimdialogpixdir = $(datadir)/pixmaps/gaim/dialogs
 gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png gaim_cool.png gaim_auth.png
Binary file pixmaps/clear.png has changed
Binary file pixmaps/edit.png has changed
Binary file pixmaps/insert-link-small.png has changed
Binary file pixmaps/msgpend.png has changed
Binary file pixmaps/msgunread.png has changed
Binary file pixmaps/status/default/blocked.png has changed
Binary file pixmaps/status/default/dnd.png has changed
Binary file pixmaps/status/default/freeforchat.png has changed
Binary file pixmaps/status/default/gadu-gadu.png has changed
Binary file pixmaps/status/default/halfop.png has changed
Binary file pixmaps/status/default/ignored.png has changed
Binary file pixmaps/status/default/invisible.png has changed
Binary file pixmaps/status/default/jabber.png has changed
Binary file pixmaps/status/default/na.png has changed
Binary file pixmaps/status/default/napster.png has changed
Binary file pixmaps/status/default/notauthorized.png has changed
Binary file pixmaps/status/default/op.png has changed
Binary file pixmaps/status/default/voice.png has changed
Binary file pixmaps/status/default/zephyr.png has changed
Binary file pixmaps/text_bigger.png has changed
Binary file pixmaps/text_smaller.png has changed
--- a/src/gtkstock.c	Tue Aug 30 05:21:58 2005 +0000
+++ b/src/gtkstock.c	Tue Aug 30 05:53:56 2005 +0000
@@ -38,11 +38,15 @@
 {
 	{ 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 @@
 	{ 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 @@
 	{ 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          },