pidgin/ljfisher-ssl-client-auth

e5cf84327279
Parents 62c68cdd2fc2
Children ec1aeab6f886
applied changes from 17bcbc27490a107b719d992aeeeda076daf53257
through 64a3b3dde6e25c7b9fa7d1cfc51f364825d7ae6f

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

Refs #14297
--- 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);