Mercurial > pidgin
changeset 23528:06e6043ee51c
merge of '057f9dd738df2f3f1b3bd757d04cdd78dd379ecb'
and 'f628b0dd910dce9a1db02785b5ee59ffbcfd91c4'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 13 Jul 2008 04:31:18 +0000 |
| parents | 25aec47d9671 (diff) 3670d6c05da2 (current diff) |
| children | 4162ac08c775 |
| files | libpurple/protocols/msn/notification.c |
| diffstat | 7 files changed, 33 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/irc/msgs.c Sun Jul 13 04:31:00 2008 +0000 +++ b/libpurple/protocols/irc/msgs.c Sun Jul 13 04:31:18 2008 +0000 @@ -215,10 +215,8 @@ /* This is an extended syntax, not in RFC 1459 */ int t1 = atoi(args[4]); time_t t2 = time(NULL); - msg = g_strdup_printf(ngettext("Ban on %s by %s, set %ld second ago", - "Ban on %s by %s, set %ld seconds ago", - t2 - t1), - args[2], args[3], t2 - t1); + msg = g_strdup_printf(_("Ban on %s by %s, set %s ago"), + args[2], args[3], purple_str_seconds_to_string(t2 - t1)); } else { msg = g_strdup_printf(_("Ban on %s"), args[2]); }
--- a/libpurple/protocols/msn/msn.c Sun Jul 13 04:31:00 2008 +0000 +++ b/libpurple/protocols/msn/msn.c Sun Jul 13 04:31:18 2008 +0000 @@ -393,6 +393,8 @@ _("Cancel"), NULL); } +/* QuLogic: Disabled until confirmed correct. */ +#if 0 static void msn_show_blocked_text(PurplePluginAction *action) { @@ -415,6 +417,7 @@ } g_free(title); } +#endif static void msn_show_hotmail_inbox(PurplePluginAction *action) @@ -856,10 +859,13 @@ msn_show_set_mobile_pages); m = g_list_append(m, act); +/* QuLogic: Disabled until confirmed correct. */ +#if 0 m = g_list_append(m, NULL); act = purple_plugin_action_new(_("View Blocked Text..."), msn_show_blocked_text); m = g_list_append(m, act); +#endif account = purple_connection_get_account(gc); user = msn_normalize(account, purple_account_get_username(account));
--- a/libpurple/protocols/msn/notification.c Sun Jul 13 04:31:00 2008 +0000 +++ b/libpurple/protocols/msn/notification.c Sun Jul 13 04:31:18 2008 +0000 @@ -1476,6 +1476,8 @@ gcf_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len) { +/* QuLogic: Disabled until confirmed correct. */ +#if 0 xmlnode *root; xmlnode *policy; @@ -1514,6 +1516,7 @@ } xmlnode_free(root); +#endif } static void
--- a/libpurple/protocols/msn/servconn.c Sun Jul 13 04:31:00 2008 +0000 +++ b/libpurple/protocols/msn/servconn.c Sun Jul 13 04:31:18 2008 +0000 @@ -255,6 +255,12 @@ { g_return_if_fail(servconn != NULL); + if (servconn->connect_data != NULL) + { + purple_proxy_connect_cancel(servconn->connect_data); + servconn->connect_data = NULL; + } + if (!servconn->connected) { /* We could not connect. */ @@ -273,12 +279,6 @@ return; } - if (servconn->connect_data != NULL) - { - purple_proxy_connect_cancel(servconn->connect_data); - servconn->connect_data = NULL; - } - if (servconn->inpa > 0) { purple_input_remove(servconn->inpa);
--- a/libpurple/protocols/msnp9/command.c Sun Jul 13 04:31:00 2008 +0000 +++ b/libpurple/protocols/msnp9/command.c Sun Jul 13 04:31:18 2008 +0000 @@ -65,9 +65,12 @@ for (c = 0; cmd->params[c]; c++); cmd->param_count = c; - param = cmd->params[0]; - - cmd->trId = is_num(param) ? atoi(param) : 0; + if (cmd->param_count) { + char *param = cmd->params[0]; + cmd->trId = is_num(param) ? atoi(param) : 0; + } else { + cmd->trId = 0; + } } else cmd->trId = 0;
--- a/libpurple/protocols/msnp9/servconn.c Sun Jul 13 04:31:00 2008 +0000 +++ b/libpurple/protocols/msnp9/servconn.c Sun Jul 13 04:31:18 2008 +0000 @@ -251,6 +251,12 @@ { g_return_if_fail(servconn != NULL); + if (servconn->connect_data != NULL) + { + purple_proxy_connect_cancel(servconn->connect_data); + servconn->connect_data = NULL; + } + if (!servconn->connected) { /* We could not connect. */ @@ -269,12 +275,6 @@ return; } - if (servconn->connect_data != NULL) - { - purple_proxy_connect_cancel(servconn->connect_data); - servconn->connect_data = NULL; - } - if (servconn->inpa > 0) { purple_input_remove(servconn->inpa);
--- a/po/de.po Sun Jul 13 04:31:00 2008 +0000 +++ b/po/de.po Sun Jul 13 04:31:18 2008 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-06 14:20+0200\n" -"PO-Revision-Date: 2008-07-06 14:20+0200\n" +"POT-Creation-Date: 2008-07-11 17:26+0200\n" +"PO-Revision-Date: 2008-07-11 17:25+0200\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -3232,10 +3232,8 @@ msgstr "Falscher Modus" #, c-format -msgid "Ban on %s by %s, set %ld second ago" -msgid_plural "Ban on %s by %s, set %ld seconds ago" -msgstr[0] "Verbot zu %s von %s, gesetzt vor %ld Sekunde" -msgstr[1] "Verbot zu %s von %s, gesetzt vor %ld Sekunden" +msgid "Ban on %s by %s, set %s ago" +msgstr "Verbot zu %s von %s, gesetzt vor %s" #, c-format msgid "Ban on %s"