# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1226818219 0
# Node ID 0320b4a3343250a033545e53b9153c2fb6847b21
# Parent  fae699fece1f0072d6a416615f423681c5dd14e1
Backport the 'purple_debug_*(msg)' -> 'purple_debug_*("%s", msg);' fixes.

applied changes from fef93b50fe2b6c172be07648cbc70b62a42fcfff
             through 111d22afa901c48464e4da4d37d1cca3381ae162

diff -r fae699fece1f -r 0320b4a33432 finch/gntdebug.c
--- a/finch/gntdebug.c	Sun Nov 16 00:10:02 2008 +0000
+++ b/finch/gntdebug.c	Sun Nov 16 06:50:19 2008 +0000
@@ -233,7 +233,7 @@
 	}
 
 	fprintf(fp, "Finch Debug Log : %s\n", purple_date_format_full(NULL));
-	fprintf(fp, tv->string->str);
+	fprintf(fp, "%s", tv->string->str);
 	fclose(fp);
 	gnt_widget_destroy(GNT_WIDGET(fs));
 }
diff -r fae699fece1f -r 0320b4a33432 libpurple/plugins/tcl/tcl_cmd.c
--- a/libpurple/plugins/tcl/tcl_cmd.c	Sun Nov 16 00:10:02 2008 +0000
+++ b/libpurple/plugins/tcl/tcl_cmd.c	Sun Nov 16 06:50:19 2008 +0000
@@ -159,7 +159,7 @@
 
 		errorstr = g_strdup_printf("error evaluating callback: %s\n",
 		                           Tcl_GetString(Tcl_GetObjResult(handler->interp)));
-		purple_debug(PURPLE_DEBUG_ERROR, "tcl", errorstr);
+		purple_debug(PURPLE_DEBUG_ERROR, "tcl", "%s", errorstr);
 		*errors = errorstr;
 		retval = PURPLE_CMD_RET_FAILED;
 	} else {
@@ -170,7 +170,7 @@
 
 			errorstr = g_strdup_printf("Error retreiving procedure result: %s\n",
 			                           Tcl_GetString(Tcl_GetObjResult(handler->interp)));
-			purple_debug(PURPLE_DEBUG_ERROR, "tcl", errorstr);
+			purple_debug(PURPLE_DEBUG_ERROR, "tcl", "%s", errorstr);
 			*errors = errorstr;
 			retval = PURPLE_CMD_RET_FAILED;
 		}
diff -r fae699fece1f -r 0320b4a33432 libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c	Sun Nov 16 00:10:02 2008 +0000
+++ b/libpurple/protocols/gg/gg.c	Sun Nov 16 06:50:19 2008 +0000
@@ -2232,7 +2232,7 @@
 			break;
 	}
 
-	purple_debug(purple_level, "gg", msg);
+	purple_debug(purple_level, "gg", "%s", msg);
 	g_free(msg);
 }
 /* }}} */
diff -r fae699fece1f -r 0320b4a33432 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sun Nov 16 00:10:02 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sun Nov 16 06:50:19 2008 +0000
@@ -1676,7 +1676,7 @@
 	for (x = 0; x < 16; x++)
 		g_string_append_printf(msg, "%02hhx ", (unsigned char)m[x]);
 	g_string_append(msg, "\n");
-	purple_debug_misc("oscar", msg->str);
+	purple_debug_misc("oscar", "%s", msg->str);
 	g_string_free(msg, TRUE);
 
 	purple_input_remove(pos->inpa);
@@ -4947,7 +4947,7 @@
 	for (i=0; i<numtypes; i++)
 		g_string_append_printf(msg, " max type 0x%04x=%hd,", i, maxitems[i]);
 	g_string_append(msg, "\n");
-	purple_debug_misc("oscar", msg->str);
+	purple_debug_misc("oscar", "%s", msg->str);
 	g_string_free(msg, TRUE);
 
 	if (numtypes >= 0)
diff -r fae699fece1f -r 0320b4a33432 libpurple/protocols/qq/utils.c
--- a/libpurple/protocols/qq/utils.c	Sun Nov 16 00:10:02 2008 +0000
+++ b/libpurple/protocols/qq/utils.c	Sun Nov 16 06:50:19 2008 +0000
@@ -325,7 +325,7 @@
 	va_end(args);
 
 	if (bytes <= 0) {
-		purple_debug(level, category, arg_s);
+		purple_debug(level, category, "%s", arg_s);
 		return;
 	}
 
diff -r fae699fece1f -r 0320b4a33432 libpurple/proxy.c
--- a/libpurple/proxy.c	Sun Nov 16 00:10:02 2008 +0000
+++ b/libpurple/proxy.c	Sun Nov 16 06:50:19 2008 +0000
@@ -1342,7 +1342,7 @@
 
 	if ((buf[0] != 0x05) || (buf[1] != 0x00)) {
 		if ((buf[0] == 0x05) && (buf[1] < 0x09)) {
-			purple_debug_error("socks5 proxy", socks5errors[buf[1]]);
+			purple_debug_error("socks5 proxy", "%s", socks5errors[buf[1]]);
 			purple_proxy_connect_data_disconnect(connect_data,
 					socks5errors[buf[1]]);
 		} else {