Mercurial > pidgin
changeset 15716:72a63319582e
merge of '5dbdd56be5ea06c466608c3daa50388cd6c013a8'
and 'ecbfd3232f7d34b5ba9630d89174e490d92babe7'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 26 Feb 2007 00:11:58 +0000 |
| parents | 557f37189a96 (current diff) 2a673784fa56 (diff) |
| children | 1f7106b999d5 |
| files | pidgin/pixmaps/tray/16/Makefile.am pidgin/pixmaps/tray/16/tray-away.ico pidgin/pixmaps/tray/16/tray-away.png pidgin/pixmaps/tray/16/tray-busy.ico pidgin/pixmaps/tray/16/tray-busy.png pidgin/pixmaps/tray/16/tray-connecting.png pidgin/pixmaps/tray/16/tray-extended-away.ico pidgin/pixmaps/tray/16/tray-extended-away.png pidgin/pixmaps/tray/16/tray-message.ico pidgin/pixmaps/tray/16/tray-message.png pidgin/pixmaps/tray/16/tray-offline.ico pidgin/pixmaps/tray/16/tray-offline.png pidgin/pixmaps/tray/16/tray-online.ico pidgin/pixmaps/tray/16/tray-online.png |
| diffstat | 33 files changed, 29 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Feb 25 23:52:12 2007 +0000 +++ b/configure.ac Mon Feb 26 00:11:58 2007 +0000 @@ -1938,7 +1938,7 @@ pidgin/pixmaps/toolbar/16/Makefile pidgin/pixmaps/toolbar/16/scalable/Makefile pidgin/pixmaps/tray/Makefile - pidgin/pixmaps/tray/16/Makefile + pidgin/pixmaps/tray/22/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/gestures/Makefile
--- a/pidgin/gaimstock.c Sun Feb 25 23:52:12 2007 +0000 +++ b/pidgin/gaimstock.c Mon Feb 26 00:11:58 2007 +0000 @@ -164,13 +164,13 @@ { PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_PENDING, "status", "message-pending.png", TRUE, FALSE, FALSE, FALSE }, - { PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, FALSE, FALSE, FALSE }, - { PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", TRUE, FALSE, FALSE, FALSE }, - { PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", TRUE, FALSE, FALSE, FALSE }, - { PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, FALSE, FALSE, FALSE }, - { PIDGIN_STOCK_TRAY_OFFLINE, "tray", "tray-offline.png", TRUE, FALSE, FALSE, FALSE }, - { PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-connecting.png", TRUE, FALSE, FALSE, FALSE }, - { PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-message.png", TRUE, FALSE, FALSE, FALSE } + { PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", FALSE, TRUE, FALSE, FALSE }, + { PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", FALSE, TRUE, FALSE, FALSE }, + { PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", FALSE, TRUE, FALSE, FALSE }, + { PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", FALSE, TRUE, FALSE, FALSE }, + { PIDGIN_STOCK_TRAY_OFFLINE, "tray", "tray-offline.png", FALSE, TRUE, FALSE, FALSE }, + { PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-connecting.png", FALSE, TRUE, FALSE, FALSE }, + { PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-message.png", FALSE, TRUE, FALSE, FALSE } }; static gchar *
--- a/pidgin/gtkdocklet-x11.c Sun Feb 25 23:52:12 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Mon Feb 26 00:11:58 2007 +0000 @@ -116,7 +116,7 @@ } if(icon_name) - gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); + gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL)); #if 0 GdkPixbuf *p;
--- a/pidgin/pixmaps/tray/16/Makefile.am Sun Feb 25 23:52:12 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -TRAY_ICONS = tray-away.png \ - tray-busy.png \ - tray-connecting.png \ - tray-extended-away.png \ - tray-message.png \ - tray-offline.png \ - tray-online.png - -EXTRA_DIST = tray-away.ico \ - tray-busy.ico \ - tray-connecting.ico \ - tray-extended-away.ico \ - tray-message.ico \ - tray-offline.ico \ - tray-online.ico - -pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/16 -pidgintraypix_DATA = $(TRAY_ICONS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/tray/22/Makefile.am Mon Feb 26 00:11:58 2007 +0000 @@ -0,0 +1,18 @@ +TRAY_ICONS = tray-away.png \ + tray-busy.png \ + tray-connecting.png \ + tray-extended-away.png \ + tray-message.png \ + tray-offline.png \ + tray-online.png + +EXTRA_DIST = tray-away.ico \ + tray-busy.ico \ + tray-connecting.ico \ + tray-extended-away.ico \ + tray-message.ico \ + tray-offline.ico \ + tray-online.ico + +pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/16 +pidgintraypix_DATA = $(TRAY_ICONS)
--- a/pidgin/pixmaps/tray/Makefile.am Sun Feb 25 23:52:12 2007 +0000 +++ b/pidgin/pixmaps/tray/Makefile.am Mon Feb 26 00:11:58 2007 +0000 @@ -1,1 +1,1 @@ -SUBDIRS = 16 +SUBDIRS = 22
--- a/pidgin/win32/gtkdocklet-win32.c Sun Feb 25 23:52:12 2007 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Mon Feb 26 00:11:58 2007 +0000 @@ -443,7 +443,7 @@ static HICON load_hicon_from_stock(const char *stock) { HICON hicon = NULL; GdkPixbuf *pixbuf = gtk_widget_render_icon(image, stock, - gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL), NULL); + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL), NULL); if (pixbuf) { hicon = pixbuf_to_hicon(pixbuf);