pidgin.2.9.0: 33261adf: applied changes from d4ad4dcf4f618793c92...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 33261adfe3a390ba3d8545224305846861682c7c
Parent:   7b9efa594d3a94f77d00a96bbeda2a71a48e8616
Author:   markdoliner at pidgin.im
Date:     06/20/11 01:32:40
Branch:   im.pidgin.pidgin.2.9.0
URL: http://d.pidgin.im/viewmtn/revision/info/33261adfe3a390ba3d8545224305846861682c7c

Changelog: 

applied changes from d4ad4dcf4f618793c9201ace11269bac63645d69
             through 1e3728083b5ef50e0df8972a39da09a1ddea8417

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

Refs #14297

Changes against parent 7b9efa594d3a94f77d00a96bbeda2a71a48e8616

  patched  libpurple/protocols/oscar/oscar.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	a7718060eb635a9891a53ce5d3ff4b0b14374590
+++ libpurple/protocols/oscar/oscar.c	137e7b27e38dce736dc481fe8d4176b528934936
@@ -1468,8 +1468,8 @@ static int purple_parse_oncoming(OscarDa
 		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);