comparison libpurple/protocols/oscar/oscar.c @ 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 c7da54111ea0
comparison
equal deleted inserted replaced
22113:3afd04d5f9d6 22114:1aeac7b2051f
1793 purple_prpl_got_user_status(account, info->sn, OSCAR_STATUS_ID_MOBILE, NULL); 1793 purple_prpl_got_user_status(account, info->sn, OSCAR_STATUS_ID_MOBILE, NULL);
1794 } else { 1794 } else {
1795 purple_prpl_got_user_status_deactive(account, info->sn, OSCAR_STATUS_ID_MOBILE); 1795 purple_prpl_got_user_status_deactive(account, info->sn, OSCAR_STATUS_ID_MOBILE);
1796 } 1796 }
1797 1797
1798 if (status_id == OSCAR_STATUS_ID_AVAILABLE) 1798 if (!strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE))
1799 { 1799 {
1800 char *message = NULL; 1800 char *message = NULL;
1801 1801
1802 if (info->status != NULL && info->status[0] != '\0') 1802 if (info->status != NULL && info->status[0] != '\0')
1803 /* Grab the available message */ 1803 /* Grab the available message */
4454 PurpleConnection *gc = purple_account_get_connection(account); 4454 PurpleConnection *gc = purple_account_get_connection(account);
4455 OscarData *od = gc->proto_data; 4455 OscarData *od = gc->proto_data;
4456 PurplePresence *presence; 4456 PurplePresence *presence;
4457 PurpleStatusType *status_type; 4457 PurpleStatusType *status_type;
4458 PurpleStatusPrimitive primitive; 4458 PurpleStatusPrimitive primitive;
4459 gboolean invisible;
4460 4459
4461 char *htmlinfo; 4460 char *htmlinfo;
4462 char *info_encoding = NULL; 4461 char *info_encoding = NULL;
4463 char *info = NULL; 4462 char *info = NULL;
4464 gsize infolen = 0; 4463 gsize infolen = 0;
4469 gsize awaylen = 0; 4468 gsize awaylen = 0;
4470 4469
4471 status_type = purple_status_get_type(status); 4470 status_type = purple_status_get_type(status);
4472 primitive = purple_status_type_get_primitive(status_type); 4471 primitive = purple_status_type_get_primitive(status_type);
4473 presence = purple_account_get_presence(account); 4472 presence = purple_account_get_presence(account);
4474 invisible = purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_INVISIBLE);
4475 4473
4476 if (!setinfo) 4474 if (!setinfo)
4477 { 4475 {
4478 /* Do nothing! */ 4476 /* Do nothing! */
4479 } 4477 }