pidgin.2.9.0: 7b9efa59: applied changes from 00c6d11a264a02d1aaa...

[markdoliner at pidgin.im]

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

Changelog: 

applied changes from 00c6d11a264a02d1aaa23feb52eab5ca46e655c8
             through d4ad4dcf4f618793c9201ace11269bac63645d69

Original commit message:
oscar: Avoid a few printf("%s", NULL)s

Thanks to clh and dustin.
Fixes #14295, #14297.

Changes against parent a4ef134e22b62b71c829ea3683bbafa303c7a195

  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/oscar.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	033f22e0cdfdd5956290f651ce79a75568bed19b
+++ libpurple/protocols/oscar/oscar.c	a7718060eb635a9891a53ce5d3ff4b0b14374590
@@ -1465,11 +1465,11 @@ static int purple_parse_oncoming(OscarDa
 		} else if (previous_status != NULL && purple_status_is_available(previous_status)) {
 			itmsurl = g_strdup(purple_status_get_attr_string(previous_status, "itmsurl"));
 		}
-		purple_debug_info("oscar", "Activating status '%s' for buddy %s, message = '%s', itmsurl = '%s'\n", status_id, info->bn, message, itmsurl);
+		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, NULL);
+		purple_prpl_got_user_status(account, info->bn, status_id, "message", message ? message : "(null)", NULL);
 	}
 
 	g_free(message);
============================================================
--- libpurple/protocols/oscar/family_feedbag.c	79463d5f485b87238c7d5cb3028fe1371c4333af
+++ libpurple/protocols/oscar/family_feedbag.c	8f80e2c5acd2b21acc88d54ba8e5ab43dbdaa3e2
@@ -100,7 +100,8 @@ aim_ssi_item_debug_append(GString *str, 
 {
 	g_string_append_printf(str, 
 		"%s gid=0x%04hx, bid=0x%04hx, list_type=0x%04hx [%s], name=%s.\n",
-		prefix, item->gid, item->bid, item->type, aim_ssi_type_to_string(item->type), item->name);
+		prefix, item->gid, item->bid, item->type, aim_ssi_type_to_string(item->type),
+		item->name ? item->name : "(null)");
 }
 
 /**