Mercurial > pidgin
changeset 23704:86bef5b06f70
merge of '103b421151d9a077e40a662e8d3743b5232f3da4'
and 'acfad3317f67456bc14db0041b24cf422cfa18e6'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 12 Aug 2008 04:37:18 +0000 |
| parents | b00579ec01be (current diff) d79c30d1582a (diff) |
| children | 7c58107415bc |
| files | |
| diffstat | 4 files changed, 117 insertions(+), 70 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/caps.c Sun Aug 10 22:59:07 2008 +0000 +++ b/libpurple/protocols/jabber/caps.c Tue Aug 12 04:37:18 2008 +0000 @@ -437,8 +437,6 @@ /* collect data and fetch all exts */ xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", "http://jabber.org/protocol/disco#info"); - xmlnode *child; - GList *iter; jabber_caps_cbplususerdata *userdata = data; /* TODO: Better error checking! */ @@ -446,6 +444,8 @@ if (query) { JabberCapsValue *value = g_new0(JabberCapsValue, 1); JabberCapsKey *key = g_new0(JabberCapsKey, 1); + xmlnode *child; + GList *iter; value->ext = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_caps_ext_destroy_value); @@ -475,23 +475,29 @@ } g_hash_table_replace(capstable, key, value); jabber_caps_store(); - } + - /* fetch all exts */ - for(iter = userdata->ext; iter; iter = g_list_next(iter)) { - JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info"); - xmlnode *query = xmlnode_get_child_with_namespace(iq->node, "query", "http://jabber.org/protocol/disco#info"); - char *node = g_strdup_printf("%s#%s", userdata->node, (const char*)iter->data); - jabber_ext_userdata *ext_data = g_new0(jabber_ext_userdata, 1); - ext_data->node = node; - ext_data->userdata = userdata; + /* fetch all exts */ + for(iter = userdata->ext; iter; iter = g_list_next(iter)) { + JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET, + "http://jabber.org/protocol/disco#info"); + xmlnode *query = xmlnode_get_child_with_namespace(iq->node, + "query", "http://jabber.org/protocol/disco#info"); + char *node = g_strdup_printf("%s#%s", userdata->node, (const char*)iter->data); + jabber_ext_userdata *ext_data = g_new0(jabber_ext_userdata, 1); + ext_data->node = node; + ext_data->userdata = userdata; - xmlnode_set_attrib(query, "node", node); - xmlnode_set_attrib(iq->node, "to", userdata->who); + xmlnode_set_attrib(query, "node", node); + xmlnode_set_attrib(iq->node, "to", userdata->who); - jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, ext_data); - jabber_iq_send(iq); - } + jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, ext_data); + jabber_iq_send(iq); + } + + } else + /* Don't wait for the ext discoveries; they aren't going to happen */ + userdata->extOutstanding = 0; jabber_caps_get_info_check_completion(userdata); }
--- a/libpurple/protocols/msn/state.c Sun Aug 10 22:59:07 2008 +0000 +++ b/libpurple/protocols/msn/state.c Tue Aug 12 04:37:18 2008 +0000 @@ -61,23 +61,23 @@ psmNode = xmlnode_new("PSM"); if(psmstr != NULL){ - xmlnode_insert_data(psmNode,psmstr,strlen(psmstr)); + xmlnode_insert_data(psmNode, psmstr, -1); } - xmlnode_insert_child(dataNode,psmNode); + xmlnode_insert_child(dataNode, psmNode); mediaNode = xmlnode_new("CurrentMedia"); if(mediastr != NULL){ - xmlnode_insert_data(mediaNode,mediastr,strlen(mediastr)); + xmlnode_insert_data(mediaNode, mediastr, -1); } - xmlnode_insert_child(dataNode,mediaNode); + xmlnode_insert_child(dataNode, mediaNode); guidNode = xmlnode_new("MachineGuid"); if(guidstr != NULL){ - xmlnode_insert_data(guidNode,guidstr,strlen(guidstr)); + xmlnode_insert_data(guidNode, guidstr, -1); } - xmlnode_insert_child(dataNode,guidNode); + xmlnode_insert_child(dataNode, guidNode); - result = xmlnode_to_str(dataNode,&length); + result = xmlnode_to_str(dataNode, &length); xmlnode_free(dataNode); return result; }
--- a/po/de.po Sun Aug 10 22:59:07 2008 +0000 +++ b/po/de.po Tue Aug 12 04:37:18 2008 +0000 @@ -11,15 +11,14 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-06 17:47+0200\n" -"PO-Revision-Date: 2008-08-06 17:47+0200\n" -"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" +"POT-Creation-Date: 2008-08-11 21:42+0200\n" +"PO-Revision-Date: 2008-08-11 21:49+0200\n" +"Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" #. Translators may want to transliterate the name. #. It is not to be translated. @@ -652,11 +651,11 @@ msgid "<AUTO-REPLY> " msgstr "<AUTO-REPLY> " -#, fuzzy, c-format +#, c-format msgid "List of %d user:\n" msgid_plural "List of %d users:\n" -msgstr[0] "Liste der Benutzer:\n" -msgstr[1] "Liste der Benutzer:\n" +msgstr[0] "Liste von %d Benutzer:\n" +msgstr[1] "Liste von %d Benutzern:\n" msgid "Supported debug options are: version" msgstr "Unterstützte Debug-Optionen sind: version" @@ -2820,8 +2819,9 @@ "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d." "pidgin.im/BonjourWindows for more information." msgstr "" -"Apples Bonjour-Toolkit für Windows konnte nicht gefunden werden, für weitere " -"Informationen besuchen Sie die FAQ unter: http://d.pidgin.im/BonjourWindows" +"Apples Bonjour-Toolkit für Windows konnte nicht gefunden werden. Für weitere " +"Informationen besuchen Sie die FAQ unter: http://d.pidgin.im/BonjourWindows " +"für weitere Informationen." msgid "Unable to listen for incoming IM connections\n" msgstr "Kann nicht auf eingehende IM-Verbindungen hören\n" @@ -7330,13 +7330,6 @@ "Beachten Sie, dass diese Operation den Qun entfernen könnte, \n" "wenn Sie der Ersteller sind." -#, c-format -msgid "Code [0x%02X]: %s" -msgstr "Code [0x%02X]: %s" - -msgid "Group Operation Error" -msgstr "Gruppenoperationsfehler" - #. we want to see window msgid "Do you want to approve the request?" msgstr "Wollen sie die Anfrage akzeptieren?" @@ -7381,26 +7374,23 @@ msgid " TCP" msgstr " TCP" -#, fuzzy msgid " FromMobile" -msgstr "Mobil" - -#, fuzzy +msgstr " FromMobile" + msgid " BindMobile" -msgstr "Mobil" +msgstr "BindMobile" msgid " Video" msgstr " Video" -#, fuzzy msgid " Space" -msgstr "MySpace" +msgstr " Raum" msgid "Flag" -msgstr "" +msgstr "Flagge" msgid "Ver" -msgstr "" +msgstr "Ver" msgid "Invalid name" msgstr "QQ: Ungültiger Name" @@ -7476,18 +7466,17 @@ msgstr "Über TCP verbinden" msgid "resend interval(s)" -msgstr "" - -#, fuzzy +msgstr "Neusenden-Intervall(e)" + msgid "Keep alive interval(s)" -msgstr "Fehler beim Aufrechterhalten der Verbindung (Keep alive)" +msgstr "Intervall(e) zum Aufrechterhalten der Verbindung (Keep alive)" msgid "Update interval(s)" -msgstr "" - -#, fuzzy, c-format +msgstr "Aktualisierungsintervall(e)" + +#, c-format msgid "Invalid token len, %d" -msgstr "Ungültige Bezeichnung" +msgstr "Ungültige Länge des Tokens, %d" msgid "Keep alive error" msgstr "Fehler beim Aufrechterhalten der Verbindung (Keep alive)" @@ -7539,8 +7528,30 @@ msgstr "Anmeldung fehlgeschlagen" #, c-format +msgid "" +"Reply %s(0x%02X )\n" +"Sent %s(0x%02X )\n" +"Room id %d, reply [0x%02X]: \n" +"%s" +msgstr "" +"Antwort %s(0x%02X )\n" +"Gesendet %s(0x%02X )\n" +"Raum-ID %d, Antwort [0x%02X]: \n" +"%s" + +msgid "Failed room reply" +msgstr "Antwort vom Raum gescheitert" + +#, c-format +msgid "You are not a member of group \"%s\"\n" +msgstr "Sie sind ein Mitglied der Gruppe „%s“\n" + +msgid "Can not decrypt login reply" +msgstr "Kann die Antwort der Anmeldung nicht entschlüsseln" + +#, c-format msgid "Invalid token reply code, 0x%02X" -msgstr "" +msgstr "Ungültiger Token-Antwort-Code, 0x%02X" #, c-format msgid "%d has declined the file %s" @@ -7589,7 +7600,7 @@ msgid "%s is not in your buddy list" msgstr "%s ist nicht in Ihrer Buddy-Liste" -#, fuzzy, c-format +#, c-format msgid "Notice from: %s" msgstr "Ankündigung von %s" @@ -9932,6 +9943,12 @@ msgid "+++ %s became unidle" msgstr "+++ %s wurde tätig" +#. +#. * This string determines how some dates are displayed. The default +#. * string "%x %X" shows the date then the time. Translators can +#. * change this to "%X %x" if they want the time to be shown first, +#. * followed by the date. +#. #, c-format msgid "%x %X" msgstr "%x %X"
--- a/po/fi.po Sun Aug 10 22:59:07 2008 +0000 +++ b/po/fi.po Tue Aug 12 04:37:18 2008 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-06 16:01+0300\n" -"PO-Revision-Date: 2008-08-06 16:01+0300\n" +"POT-Creation-Date: 2008-08-11 12:39+0300\n" +"PO-Revision-Date: 2008-08-11 12:39+0300\n" "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -7290,13 +7290,6 @@ "Huomaa, että olet samalla Qunin luoja, \n" "Tämä toiminto poistaa lopulta tämän Qunin." -#, c-format -msgid "Code [0x%02X]: %s" -msgstr "Koodi [0x%02X]: %s" - -msgid "Group Operation Error" -msgstr "Ryhmätoimintovirhe" - #. we want to see window msgid "Do you want to approve the request?" msgstr "Haluatko hyväksyä pyynnön?" @@ -7496,6 +7489,28 @@ msgstr "Ei voi kirjautua" #, c-format +msgid "" +"Reply %s(0x%02X )\n" +"Sent %s(0x%02X )\n" +"Room id %d, reply [0x%02X]: \n" +"%s" +msgstr "" +"Vastaus %s(0x%02X )\n" +"Lähetetty %s(0x%02X )\n" +"Huoneen tunniste %d, vastaus [0x%02X]: \n" +"%s" + +msgid "Failed room reply" +msgstr "Epäonnistunut huoneen vastaus" + +#, c-format +msgid "You are not a member of group \"%s\"\n" +msgstr "Sinä et ole ryhmän \"%s\" jäsen\n" + +msgid "Can not decrypt login reply" +msgstr "Kirjautumisvastauksen salausta ei voi purkaa" + +#, c-format msgid "Invalid token reply code, 0x%02X" msgstr "Epäkelpo poletin vastauskoodi, 0x%02X" @@ -9870,6 +9885,12 @@ msgid "+++ %s became unidle" msgstr "+++ %s on aktiivinen" +#. +#. * This string determines how some dates are displayed. The default +#. * string "%x %X" shows the date then the time. Translators can +#. * change this to "%X %x" if they want the time to be shown first, +#. * followed by the date. +#. #, c-format msgid "%x %X" msgstr "%x %X" @@ -13672,6 +13693,12 @@ "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien " "virheenjäljitykseen." +#~ msgid "Code [0x%02X]: %s" +#~ msgstr "Koodi [0x%02X]: %s" + +#~ msgid "Group Operation Error" +#~ msgstr "Ryhmätoimintovirhe" + #~ msgid "Error setting socket options" #~ msgstr "Virhe asetettaessa pistokevalintoja" @@ -13709,9 +13736,6 @@ #~ msgid "UDP Address" #~ msgstr "UDP-osoite" -#~ msgid "Login failed, no reply" -#~ msgstr "Kirjautuminen epäonnistui, ei vastausta" - #~ msgid "Screen name:" #~ msgstr "Näyttönimi:"