changeset 32147:88241dbf2a6b

applied changes from d4ad4dcf4f618793c9201ace11269bac63645d69 through 1e3728083b5ef50e0df8972a39da09a1ddea8417 Original commit message: oscar: ...fix the *right* line this time. Refs #14297
author Mark Doliner <mark@kingant.net>
date Mon, 20 Jun 2011 05:32:40 +0000
parents 3ff91e34691d
children 0f75ff04b8b6
files libpurple/protocols/oscar/oscar.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);