Mercurial > pidgin
changeset 2679:94aa499ecd39
[gaim-migrate @ 2692]
This is not an advertisement and has nothing to do with who I work for. I promise. Its just about personal taste.
committer: Tailor Script <tailor@pidgin.im>
| author | Adam Fritzler <mid@auk.cx> |
|---|---|
| date | Tue, 06 Nov 2001 04:40:21 +0000 |
| parents | aa06a77990f1 |
| children | ab2ca2770d2e |
| files | src/dialogs.c src/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dialogs.c Mon Nov 05 20:51:12 2001 +0000 +++ b/src/dialogs.c Tue Nov 06 04:40:21 2001 +0000 @@ -74,6 +74,7 @@ #include "pixmaps/free_icon.xpm" #include "pixmaps/dt_icon.xpm" #include "pixmaps/admin_icon.xpm" +#include "pixmaps/ab.xpm" #define DEFAULT_FONT_NAME "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1" @@ -1650,6 +1651,8 @@ return dt_icon_xpm; if (!g_strcasecmp(url, "admin_icon.gif")) return admin_icon_xpm; + if (!g_strcasecmp(url, "ab_icon.gif")) + return ab_xpm; return NULL; }
--- a/src/protocols/oscar/oscar.c Mon Nov 05 20:51:12 2001 +0000 +++ b/src/protocols/oscar/oscar.c Tue Nov 06 04:40:21 2001 +0000 @@ -1545,7 +1545,8 @@ static char *images(int flags) { static char buf[1024]; - g_snprintf(buf, sizeof(buf), "%s%s%s%s", + g_snprintf(buf, sizeof(buf), "%s%s%s%s%s", + (flags & AIM_FLAG_ACTIVEBUDDY) ? "<IMG SRC=\"ab_icon.gif\">" : "", (flags & AIM_FLAG_UNCONFIRMED) ? "<IMG SRC=\"dt_icon.gif\">" : "", (flags & AIM_FLAG_AOL) ? "<IMG SRC=\"aol_icon.gif\">" : "", (flags & AIM_FLAG_ADMINISTRATOR) ? "<IMG SRC=\"admin_icon.gif\">" : "", @@ -2462,10 +2463,10 @@ return icon_offline_xpm; return icon_online_xpm; } - if (uc & UC_AB) - return (char **)ab_xpm; if (uc & UC_UNAVAILABLE) return (char **)away_icon_xpm; + if ((uc & UC_AB) && (uc & UC_NORMAL)) + return (char **)ab_xpm; if (uc & UC_AOL) return (char **)aol_icon_xpm; if (uc & UC_ADMIN)