# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1308547960 0
# Node ID 88241dbf2a6b08314ea429226d046907d865ef31
# Parent  3ff91e34691d3490ac8a4c7d950149da0b4df9cf
applied changes from d4ad4dcf4f618793c9201ace11269bac63645d69
             through 1e3728083b5ef50e0df8972a39da09a1ddea8417

Original commit message:
oscar: ...fix the *right* line this time.

Refs #14297

diff -r 3ff91e34691d -r 88241dbf2a6b libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Mon Jun 20 05:32:19 2011 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon Jun 20 05:32:40 2011 +0000
@@ -1468,8 +1468,8 @@
 		purple_debug_info("oscar", "Activating status '%s' for buddy %s, message = '%s', itmsurl = '%s'\n", status_id, info->bn, message ? message : "(null)", itmsurl ? itmsurl : "(null)");
 		purple_prpl_got_user_status(account, info->bn, status_id, "message", message, "itmsurl", itmsurl, NULL);
 	} else {
-		purple_debug_info("oscar", "Activating status '%s' for buddy %s, message = '%s'\n", status_id, info->bn, message);
-		purple_prpl_got_user_status(account, info->bn, status_id, "message", message ? message : "(null)", NULL);
+		purple_debug_info("oscar", "Activating status '%s' for buddy %s, message = '%s'\n", status_id, info->bn, message ? message : "(null)");
+		purple_prpl_got_user_status(account, info->bn, status_id, "message", message, NULL);
 	}
 
 	g_free(message);