pidgin: c6844c5e: The remainder of a patch from fqueze to ...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: c6844c5e097e3d947d35507e2e93557dfe8e0aee
Ancestor: 41c412e5bcee049646cb4edff0202f37b2cfb972
Author: datallah at pidgin.im
Date: 2009-01-06T02:28:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c6844c5e097e3d947d35507e2e93557dfe8e0aee

Modified files:
        libpurple/ft.c libpurple/plugin.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c

ChangeLog: 

The remainder of a patch from fqueze to fix some incorrect *printf() function
usage when no formatting was actually being used.
Fixes #7910

-------------- next part --------------
============================================================
--- libpurple/ft.c	dea1aae8598f1a74b50ee71418fc27e028f36c9a
+++ libpurple/ft.c	aecce343eddea0923459c04b16f5f6ed78acca27
@@ -700,7 +700,7 @@ purple_xfer_set_completed(PurpleXfer *xf
 			msg = g_strdup_printf(_("Transfer of file %s complete"),
 								purple_xfer_get_filename(xfer));
 		else
-			msg = g_strdup_printf(_("File transfer complete"));
+			msg = g_strdup(_("File transfer complete"));
 		purple_xfer_conversation_write(xfer, msg, FALSE);
 		g_free(msg);
 	}
@@ -1140,7 +1140,7 @@ purple_xfer_cancel_local(PurpleXfer *xfe
 	}
 	else
 	{
-		msg = g_strdup_printf(_("File transfer cancelled"));
+		msg = g_strdup(_("File transfer cancelled"));
 	}
 	purple_xfer_conversation_write(xfer, msg, FALSE);
 	g_free(msg);
============================================================
--- libpurple/plugin.c	2549ba41e1aa06b741a66c3d04e95c6874b10cc8
+++ libpurple/plugin.c	7309f99d3b111275964baa812057aad503d1e7ed
@@ -374,7 +374,7 @@ purple_plugin_probe(const char *filename
 	 */
 	if (plugin->info->id == NULL || *plugin->info->id == '\0')
 	{
-		plugin->error = g_strdup_printf(_("This plugin has not defined an ID."));
+		plugin->error = g_strdup(_("This plugin has not defined an ID."));
 		purple_debug_error("plugins", "%s is not loadable: info->id is not defined.\n", plugin->path);
 		plugin->unloadable = TRUE;
 		return plugin;
============================================================
--- libpurple/protocols/novell/novell.c	da346110e69c3d85d19e4f619edb0fd47035d321
+++ libpurple/protocols/novell/novell.c	a0dee7fa13f00e18e0792ea8d0e4be01998936f2
@@ -2519,8 +2519,8 @@ novell_chat_send(PurpleConnection * gc, 
 	/* The conference was not found, must be closed */
 	chat = purple_find_chat(gc, id);
 	if (chat) {
-		str = g_strdup_printf(_("This conference has been closed."
-								" No more messages can be sent."));
+		str = g_strdup(_("This conference has been closed."
+						 " No more messages can be sent."));
 		purple_conversation_write(chat, NULL, str, PURPLE_MESSAGE_SYSTEM, time(NULL));
 		g_free(str);
 	}
============================================================
--- libpurple/protocols/oscar/oscar.c	e38377493185cd62c874fbd9b700fcf87f04d39d
+++ libpurple/protocols/oscar/oscar.c	279f7fa19697796dfce9b07876dd1776f2d80d8c
@@ -739,21 +739,21 @@ static char *oscar_icqstatus(int state) 
 static char *oscar_icqstatus(int state) {
 	/* Make a cute little string that shows the status of the dude or dudet */
 	if (state & AIM_ICQ_STATE_CHAT)
-		return g_strdup_printf(_("Free For Chat"));
+		return g_strdup(_("Free For Chat"));
 	else if (state & AIM_ICQ_STATE_DND)
-		return g_strdup_printf(_("Do Not Disturb"));
+		return g_strdup(_("Do Not Disturb"));
 	else if (state & AIM_ICQ_STATE_OUT)
-		return g_strdup_printf(_("Not Available"));
+		return g_strdup(_("Not Available"));
 	else if (state & AIM_ICQ_STATE_BUSY)
-		return g_strdup_printf(_("Occupied"));
+		return g_strdup(_("Occupied"));
 	else if (state & AIM_ICQ_STATE_AWAY)
-		return g_strdup_printf(_("Away"));
+		return g_strdup(_("Away"));
 	else if (state & AIM_ICQ_STATE_WEBAWARE)
-		return g_strdup_printf(_("Web Aware"));
+		return g_strdup(_("Web Aware"));
 	else if (state & AIM_ICQ_STATE_INVISIBLE)
-		return g_strdup_printf(_("Invisible"));
+		return g_strdup(_("Invisible"));
 	else
-		return g_strdup_printf(_("Online"));
+		return g_strdup(_("Online"));
 }
 
 static void
============================================================
--- libpurple/protocols/oscar/peer.c	73bf32b895e0c0e767963efc9704731af75de4b0
+++ libpurple/protocols/oscar/peer.c	f65d61b859e3b0abdcdc09f1bf125e3a9a5fc3ca
@@ -859,7 +859,7 @@ peer_connection_trynext(PeerConnection *
 		{
 			gchar *tmp;
 			PurpleConversation *conv;
-			tmp = g_strdup_printf(_("Attempting to connect via proxy server."));
+			tmp = g_strdup(_("Attempting to connect via proxy server."));
 			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->sn);
 			purple_conversation_write(conv, NULL, tmp,
 					PURPLE_MESSAGE_SYSTEM, time(NULL));