Mercurial > pidgin
changeset 17610:4b78c4aec823
merge of 'ebff6c3b8f2304c88a5769e8c4c25a763f3a5c1f'
and 'fc76f1a1ca445e0b4286580eccd99b8239fd8905'
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Wed, 13 Jun 2007 00:45:53 +0000 |
parents | 6c0a747594ce (diff) 8e316800d00a (current diff) |
children | 662710d7ecf0 |
files | |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/pidginstock.c Wed Jun 13 00:40:20 2007 +0000 +++ b/pidgin/pidginstock.c Wed Jun 13 00:45:53 2007 +0000 @@ -168,7 +168,10 @@ { 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-message.png", TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL } + { PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-new-message.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 } + */ }; static gchar *
--- a/pidgin/pidginstock.h Wed Jun 13 00:40:20 2007 +0000 +++ b/pidgin/pidginstock.h Wed Jun 13 00:45:53 2007 +0000 @@ -136,6 +136,9 @@ #define PIDGIN_STOCK_TRAY_OFFLINE "pidgin-tray-offline" #define PIDGIN_STOCK_TRAY_CONNECT "pidgin-tray-connect" #define PIDGIN_STOCK_TRAY_PENDING "pidgin-tray-pending" +/* Uncomment me after 2.0.2! + * #define PIDGIN_STOCK_TRAY_EMAIL "pidgin-tray-email" + */ /*@}*/