Mercurial > pidgin.yaz
changeset 16641:2b12b143a529
merge of '061bc994c90d4a6c96166ce1b6df5ce39c5f7825'
and '8f7c67720e5712f4a88ea92a2fed9d902b961335'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 29 Apr 2007 03:50:11 +0000 |
| parents | 2a12915d957a (diff) 36a87fb00a22 (current diff) |
| children | c028fc690b5d |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkstatusbox.c Sun Apr 29 03:46:25 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sun Apr 29 03:50:11 2007 +0000 @@ -2225,7 +2225,8 @@ PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct); if (sub) { const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub); - if (!strcmp(purple_status_type_get_id(sub_type), + const char *subtype_status_id = purple_status_type_get_id(sub_type); + if (subtype_status_id && !strcmp(subtype_status_id, purple_status_type_get_id(acct_status_type))) found = TRUE; }