im.pidgin.pidgin: 650c97ec8f66c218b6d6cb44d636801cd55be7a8

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 650c97ec8f66c218b6d6cb44d636801cd55be7a8
Ancestor: fd077cb99850f2a0f5a8ba019fedfb52caf5961e
Author: deryni at pidgin.im
Date: 2008-01-15T17:21:51
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	dbaa79c139c8f6577c655ea2865ca54f9fbfdc6e
+++ libpurple/protocols/oscar/oscar.c	56456836e9d02276563c2056f7683adc7d1a917f
@@ -1795,7 +1795,7 @@ static int purple_parse_oncoming(OscarDa
 		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 @@ oscar_set_info_and_status(PurpleAccount 
 	PurplePresence *presence;
 	PurpleStatusType *status_type;
 	PurpleStatusPrimitive primitive;
-	gboolean invisible;
 
 	char *htmlinfo;
 	char *info_encoding = NULL;
@@ -4471,7 +4470,6 @@ oscar_set_info_and_status(PurpleAccount 
 	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)
 	{