Mercurial > pidgin
changeset 22114:1aeac7b2051f
Recommit the correct parts of 55eb5e28f52c9cdccc6229a8314ffbdac2260843,
apparently I didn't actually look at the 'Changes against parent' section this
morning.
------
Remove a variable that isn't used anywhere, if it was supposed to do something
feel free to add it back and make it do that.
Also, fix a compile error. Comparing a string literal and a const char * with
== likely doesn't do what was intended here.
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Tue, 15 Jan 2008 17:21:51 +0000 |
| parents | 3afd04d5f9d6 |
| children | 4ab154a14e55 651ab2001da2 |
| files | libpurple/protocols/oscar/oscar.c |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Tue Jan 15 17:17:53 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Jan 15 17:21:51 2008 +0000 @@ -1795,7 +1795,7 @@ purple_prpl_got_user_status_deactive(account, info->sn, OSCAR_STATUS_ID_MOBILE); } - if (status_id == OSCAR_STATUS_ID_AVAILABLE) + if (!strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE)) { char *message = NULL; @@ -4456,7 +4456,6 @@ PurplePresence *presence; PurpleStatusType *status_type; PurpleStatusPrimitive primitive; - gboolean invisible; char *htmlinfo; char *info_encoding = NULL; @@ -4471,7 +4470,6 @@ status_type = purple_status_get_type(status); primitive = purple_status_type_get_primitive(status_type); presence = purple_account_get_presence(account); - invisible = purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_INVISIBLE); if (!setinfo) {