Mercurial > pidgin
changeset 18825:952c01c26d67
merge of '3d3413c72d837a38e71907dab714b6b4ddd4a5af'
and 'e4a4828b90bf84ab1080455e29ac8770e0276211'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 07 Aug 2007 06:45:23 +0000 |
| parents | 8410abf85678 (diff) 8e09a0c971b9 (current diff) |
| children | f8bea3e688b0 2ae9b483c4db |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/pidginstock.c Mon Aug 06 22:43:29 2007 +0000 +++ b/pidgin/pidginstock.c Tue Aug 07 06:45:23 2007 +0000 @@ -44,7 +44,7 @@ #endif { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, - { PIDGIN_STOCK_CLOSE_TABS, "buttons", "close-tab.png" }, + { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, { PIDGIN_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, { PIDGIN_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, #if GTK_CHECK_VERSION(2,6,0)
--- a/pidgin/pixmaps/Makefile.am Mon Aug 06 22:43:29 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Tue Aug 07 06:45:23 2007 +0000 @@ -1,7 +1,6 @@ SUBDIRS = animations buddy_icons dialogs emblems emotes icons protocols status toolbar tray EXTRA_DIST = \ - close-tab.png \ edit.png \ logo.png \ pause.png \ @@ -13,7 +12,7 @@ pidgin.ico pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons -pidginbuttonpix_DATA = edit.png pause.png close-tab.png +pidginbuttonpix_DATA = edit.png pause.png pidgindistpixdir = $(datadir)/pixmaps/pidgin pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm