Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/oscar/userinfo.c	Tue May 06 18:27:58 2014 +0200
+++ b/libpurple/protocols/oscar/userinfo.c	Wed May 07 11:07:45 2014 +0200
@@ -369,7 +369,8 @@
 	purple_notify_user_info_add_pair_plaintext(user_info, NULL, buf);
 	purple_notify_userinfo(od->gc, buddy, user_info, NULL, NULL);
 	purple_notify_user_info_destroy(user_info);
-	purple_conversation_present_error(buddy, purple_connection_get_account(od->gc), buf);
+	if (!purple_conv_present_error(buddy, purple_connection_get_account(od->gc), buf))
+		purple_notify_error(od->gc, NULL, buf, NULL);
 	g_free(buf);
 }
 
@@ -403,7 +404,7 @@
 			0xFF & ((bi->ipaddr & 0xff000000) >> 24),
 			0xFF & ((bi->ipaddr & 0x00ff0000) >> 16),
 			0xFF & ((bi->ipaddr & 0x0000ff00) >> 8),
-			0xFF & ((bi->ipaddr & 0x000000ff)));
+			0xFF & (bi->ipaddr & 0x000000ff));
 		purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tstr);
 	}
 	oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first);