--- a/libpurple/protocols/oscar/oscar.c Mon Mar 18 11:53:11 2013 +0100 +++ b/libpurple/protocols/oscar/oscar.c Mon Mar 18 12:50:51 2013 +0100 @@ -2686,7 +2686,6 @@ } static int purple_selfinfo(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) { - int warning_level; va_list ap; aim_userinfo_t *info; @@ -2696,15 +2695,6 @@ purple_connection_set_display_name(od->gc, info->bn); - /* - * What's with the + 0.5? - * The 0.5 is basically poor-man's rounding. Normally - * casting "13.7" to an int will truncate to "13," but - * with 13.7 + 0.5 = 14.2, which becomes "14" when - * truncated. - */ - warning_level = info->warnlevel/10.0 + 0.5; - return 1; } @@ -4138,7 +4128,7 @@ if ((retval->name != NULL) && !purple_conv_present_error(retval->name, purple_connection_get_account(gc), buf)) purple_notify_error(gc, NULL, _("Unable to Add"), buf); g_free(buf); - } + } break; case 0x000e: { /* buddy requires authorization */ if ((retval->action == SNAC_SUBTYPE_FEEDBAG_ADD) && (retval->name)) @@ -4566,7 +4556,6 @@ OscarData *od = NULL; PurpleAccount *account = NULL; PurplePresence *presence; - PurpleStatus *status; aim_userinfo_t *userinfo = NULL; const char *name; @@ -4580,7 +4569,6 @@ userinfo = aim_locate_finduserinfo(od, name); presence = purple_buddy_get_presence(b); - status = purple_presence_get_active_status(presence); if (purple_presence_is_online(presence) == FALSE) { char *gname;