Mercurial > pidgin

changeset 17611:662710d7ecf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '10fd9d69da179933afa02f2731b53d2ee40d28ee' and '819201eb9bbf324518b0f3244ad66aae4f480521'
author Sean Egan <seanegan@gmail.com>
date Wed, 13 Jun 2007 00:52:35 +0000
parents 2dfc45eaf008 (diff) 4b78c4aec823 (current diff)
children 1f060ef64f77
files pidgin/pixmaps/tray/32/Makefile.am pidgin/pixmaps/tray/48/Makefile.am
diffstat 7 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/pidginstock.c	Wed Jun 13 00:45:53 2007 +0000
+++ b/pidgin/pidginstock.c	Wed Jun 13 00:52:35 2007 +0000
@@ -168,7 +168,7 @@
 	{ PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_OFFLINE, "tray", "tray-offline.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-connecting.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-new-message.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  }
+	{ PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-new-im.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  }
 /* Uncomment me after 2.0.2!
  *	{ PIDGIN_STOCK_TRAY_EMAIL, "tray", "tray-message.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  }
  */
--- a/pidgin/pixmaps/tray/16/Makefile.am	Wed Jun 13 00:45:53 2007 +0000
+++ b/pidgin/pixmaps/tray/16/Makefile.am	Wed Jun 13 00:52:35 2007 +0000
@@ -6,6 +6,7 @@
 		tray-connecting.png \
 		tray-extended-away.png \
 		tray-message.png \
+		tray-new-im.png \
 		tray-offline.png \
 		tray-online.png
 
Binary file pidgin/pixmaps/tray/16/tray-new-im.png has changed
--- a/pidgin/pixmaps/tray/22/Makefile.am	Wed Jun 13 00:45:53 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.am	Wed Jun 13 00:52:35 2007 +0000
@@ -6,6 +6,7 @@
 		tray-extended-away.png \
 		tray-invisible.png \
 		tray-message.png \
+		tray-new-im.png \
 		tray-offline.png \
 		tray-online.png
 
Binary file pidgin/pixmaps/tray/22/tray-new-im.png has changed
--- a/pidgin/pixmaps/tray/32/Makefile.am	Wed Jun 13 00:45:53 2007 +0000
+++ b/pidgin/pixmaps/tray/32/Makefile.am	Wed Jun 13 00:52:35 2007 +0000
@@ -3,7 +3,7 @@
 		tray-connecting.png \
 		tray-extended-away.png \
 		tray-invisible.png \
-		tray-message.png \
+		tray-new-im.png \
 		tray-offline.png \
 		tray-online.png
 
--- a/pidgin/pixmaps/tray/48/Makefile.am	Wed Jun 13 00:45:53 2007 +0000
+++ b/pidgin/pixmaps/tray/48/Makefile.am	Wed Jun 13 00:52:35 2007 +0000
@@ -3,7 +3,7 @@
 		tray-connecting.png \
 		tray-extended-away.png \
 		tray-invisible.png \
-		tray-message.png \
+		tray-new-im.png \
 		tray-offline.png \
 		tray-online.png