# HG changeset patch
# User Michael Shkutkov <mshkutkov@soc.pidgin.im>
# Date 1186083269 0
# Node ID 6840a28e8f1d96bbb3d9f99448a135ddf46cfa2f
# Parent  8b0663abb488c97d1386370c8802d43949968baf# Parent  6cfaee88c72b6ec3bdd44fa1d743d4fd5e645452
merge of '61b8cf0fe2d62b5ff8ba12cf21f350571987c5a2'
     and 'a68b6df0518f6c7efcd5ada6df7d2d0c664ea2fa'

diff -r 8b0663abb488 -r 6840a28e8f1d pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Thu Aug 02 19:15:40 2007 +0000
+++ b/pidgin/pidginstock.c	Thu Aug 02 19:34:29 2007 +0000
@@ -111,7 +111,7 @@
 	{ PIDGIN_STOCK_STATUS_LOGOUT, 	"status", "log-out.png",	TRUE, TRUE, TRUE, TRUE, FALSE, FALSE , NULL },
 	{ PIDGIN_STOCK_STATUS_OFFLINE, 	"status", "offline.png",	TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I  },
 	{ PIDGIN_STOCK_STATUS_PERSON, 	"status", "person.png",		TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_STATUS_MESSAGE, 	"status", "message-pending.png",TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_STATUS_MESSAGE, 	"toolbar", "message-new.png",TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	
 	{ PIDGIN_STOCK_STATUS_IGNORED,	"emblems", "blocked.png",	TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_STATUS_FOUNDER,	"emblems", "founder.png",	TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
@@ -155,7 +155,7 @@
 	{ PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "toolbar", "insert-image.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_INSERT_LINK, "toolbar", "insert-link.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, "toolbar", "message-new.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_PENDING, "status", "message-pending.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_PENDING, "toolbar", "message-new.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_PLUGINS, "toolbar", "plugins.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
diff -r 8b0663abb488 -r 6840a28e8f1d pidgin/pixmaps/status/16/Makefile.am
--- a/pidgin/pixmaps/status/16/Makefile.am	Thu Aug 02 19:15:40 2007 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.am	Thu Aug 02 19:34:29 2007 +0000
@@ -8,7 +8,6 @@
 		invisible.png \
 		log-in.png \
 		log-out.png \
-		message-pending.png \
 		offline.png \
 		person.png 
 
diff -r 8b0663abb488 -r 6840a28e8f1d pidgin/pixmaps/status/16/message-pending.png
Binary file pidgin/pixmaps/status/16/message-pending.png has changed