Mercurial > pidgin
changeset 24915:568b786c36f9
The remainder of a patch from fqueze to fix some incorrect *printf() function
usage when no formatting was actually being used.
Fixes #7910
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 06 Jan 2009 02:28:10 +0000 |
| parents | 1981b04de92e |
| children | 1596d09393cf 68265bcc8814 |
| files | libpurple/ft.c libpurple/plugin.c libpurple/protocols/novell/novell.c libpurple/protocols/oscar/oscar.c libpurple/protocols/oscar/peer.c |
| diffstat | 5 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/ft.c Tue Jan 06 01:25:17 2009 +0000 +++ b/libpurple/ft.c Tue Jan 06 02:28:10 2009 +0000 @@ -700,7 +700,7 @@ 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 @@ } else { - msg = g_strdup_printf(_("File transfer cancelled")); + msg = g_strdup(_("File transfer cancelled")); } purple_xfer_conversation_write(xfer, msg, FALSE); g_free(msg);
--- a/libpurple/plugin.c Tue Jan 06 01:25:17 2009 +0000 +++ b/libpurple/plugin.c Tue Jan 06 02:28:10 2009 +0000 @@ -374,7 +374,7 @@ */ 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;
--- a/libpurple/protocols/novell/novell.c Tue Jan 06 01:25:17 2009 +0000 +++ b/libpurple/protocols/novell/novell.c Tue Jan 06 02:28:10 2009 +0000 @@ -2519,8 +2519,8 @@ /* 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); }
--- a/libpurple/protocols/oscar/oscar.c Tue Jan 06 01:25:17 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Jan 06 02:28:10 2009 +0000 @@ -739,21 +739,21 @@ 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
--- a/libpurple/protocols/oscar/peer.c Tue Jan 06 01:25:17 2009 +0000 +++ b/libpurple/protocols/oscar/peer.c Tue Jan 06 02:28:10 2009 +0000 @@ -859,7 +859,7 @@ { 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));