--- a/libpurple/protocols/gg/lib/events.c Thu Apr 03 13:45:32 2014 +0200
+++ b/libpurple/protocols/gg/lib/events.c Thu Apr 03 16:02:37 2014 +0200
@@ -588,6 +588,7 @@
res = gg_resolver_recv(sess->fd, buf, sizeof(buf));
@@ -622,8 +623,10 @@
/* Sprawdź, czy mamy listę zakończoną INADDR_NONE */
+ addrs = (struct in_addr *)(void *)sess->recv_buf; for (i = 0; i < sess->recv_done / sizeof(struct in_addr); i++) {
- if (((struct in_addr*) sess->recv_buf)[i].s_addr == INADDR_NONE) {
+ if (addrs[i].s_addr == INADDR_NONE) { @@ -661,7 +664,7 @@
- len += strlen(inet_ntoa(((struct in_addr*) sess->recv_buf)[i]));
+ len += strlen(inet_ntoa(addrs[i])); @@ -675,7 +678,7 @@
- strcat(list, inet_ntoa(((struct in_addr*) sess->recv_buf)[i]));
+ strcat(list, inet_ntoa(addrs[i])); gg_debug_session(sess, GG_DEBUG_DUMP, "// gg_watch_fd() resolved: %s\n", list);
@@ -687,7 +690,7 @@
sess->state = next_state;
- sess->resolver_result = (struct in_addr*) sess->recv_buf;
+ sess->resolver_result = addrs; sess->resolver_count = count;
sess->resolver_index = 0;
@@ -1239,7 +1242,9 @@
struct gg_event *e, enum gg_state_t next_state,
enum gg_state_t alt_state, enum gg_state_t alt2_state)
+#if defined(GG_CONFIG_HAVE_GNUTLS) || defined(GG_CONFIG_HAVE_OPENSSL) #ifdef GG_CONFIG_HAVE_GNUTLS
@@ -1436,6 +1441,7 @@
+#if defined(GG_CONFIG_HAVE_GNUTLS) || defined(GG_CONFIG_HAVE_OPENSSL) gg_debug_session(sess, GG_DEBUG_MISC, "// WARNING! unable to verify hostname\n");
@@ -1450,6 +1456,7 @@
sess->timeout = GG_DEFAULT_TIMEOUT;
static gg_action_t gg_handle_reading_proxy_gg(struct gg_session *sess,
--- a/libpurple/protocols/gg/lib/protobuf-c.c Thu Apr 03 13:45:32 2014 +0200
+++ b/libpurple/protocols/gg/lib/protobuf-c.c Thu Apr 03 16:02:37 2014 +0200
@@ -919,7 +919,7 @@
- char *array = * (char * const *) member;
+ void *array = * (char * const *) member; @@ -1024,7 +1024,7 @@
for (i = 0; i < count; i++)
rv += required_field_pack (field, array, out + rv);
+ array = ((char*)array) + siz; @@ -1363,10 +1363,11 @@
buffer->append (buffer, rv, array);
@@ -1901,7 +1902,7 @@
const ProtobufCFieldDescriptor *field = scanned_member->field;
size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
size_t siz = sizeof_elt_in_repeated_array (field->type);
- char *array = *(char**)member + siz * (*p_n);
+ void *array = *(char**)member + siz * (*p_n); const uint8_t *at = scanned_member->data + scanned_member->length_prefix_len;
size_t rem = scanned_member->len - scanned_member->length_prefix_len;
@@ -2028,11 +2029,12 @@
-goto no_unpacking_needed;
memcpy (array, at, count * siz);
static protobuf_c_boolean
--- a/pidgin/gtkdialogs.c Thu Apr 03 13:45:32 2014 +0200
+++ b/pidgin/gtkdialogs.c Thu Apr 03 16:02:37 2014 +0200
@@ -173,7 +173,7 @@
{NULL, NULL, "Wangmo Sherpa", "rinwanshe@yahoo.com"},
{N_("Greek"), "el", "Katsaloulis Panayotis", "panayotis@panayotis.com"},
{NULL, NULL, "Panos Bouklis", "panos@echidna-band.com"},
- {N_("Australian English"), "en_AU", "Peter Lawler", "trans@six-by-nine.com.au"},
+ {N_("Australian English"), "en_AU", "Michael Findlay", "keltoiboy@gmail.com"}, {N_("British English"), "en_GB", "Phil Hannent", "phil@hannent.co.uk"},
{N_("Canadian English"), "en_CA", "Adam Weinberger", "adamw@gnome.org"},
{N_("Esperanto"), "eo", "Stéphane Fillod", "fillods@users.sourceforge.net"},
@@ -208,6 +208,7 @@
{NULL, NULL, "Erdal Ronahi", "erdal.ronahi@gmail.com"},
{NULL, NULL, "Rizoyê Xerzî", "rizoxerzi@hotmail.com"},
{N_("Lithuanian"), "lt", "Algimantas Margevičius", "margevicius.algimantas@gmail.com"},
+ {N_("Latvian"), "lv", "Rudolfs Mazurs", "rudolfs.mazurs@gmail.com"}, {N_("Maithili"), "mai", "Sangeeta Kumari", "sangeeta_0975@yahoo.com"},
{NULL, NULL, "Rajesh Ranjan", "rajeshkajha@yahoo.com"},
{N_("Meadow Mari"), "mhr", "David Preece", "davidpreece1@gmail.com"},
@@ -222,7 +223,7 @@
{N_("Nepali"), "ne", "Shyam Krishna Bal", NULL},
{N_("Dutch, Flemish"), "nl", "Gideon van Melle", "translations@gvmelle.com"},
{N_("Norwegian Nynorsk"), "nn", "Yngve Spjeld Landro", "l10n@landro.net"},
- {N_("Occitan"), "oc", "Yannig Marchegay", "yannig@marchegay.org"},
+ {N_("Occitan"), "oc", "Cédric Valmary", "cvalmary@yahoo.fr"}, {N_("Oriya"), "or", "Manoj Kumar Giri", "giri.manojkr@gmail.com"},
{N_("Punjabi"), "pa", "Amanpreet Singh Alam", "aalam@users.sf.net"},
{N_("Polish"), "pl", "Piotr Drąg", "piotrdrag@gmail.com"},
@@ -246,6 +247,7 @@
{NULL, NULL, "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
{N_("Telugu"), "te", "Krishnababu Krottapalli", "krottapalli@ymail.com"},
{N_("Thai"), "th", "Isriya Paireepairit", "markpeak@gmail.com"},
+ {N_("Tatar"), "tt", "ILDAR Valeev", "v_ildar@bk.ru"}, {N_("Ukranian"), "uk", "Oleksandr Kovalenko", "alx.kovalenko@gmail.com"},
{N_("Urdu"), "ur", "RKVS Raman", "rkvsraman@gmail.com"},
{N_("Vietnamese"), "vi", "Nguyễn Vũ Hưng", "vuhung16plus@gmail.com"},
@@ -274,6 +276,7 @@
{N_("German"), "de", "Daniel Seifert", NULL},
{NULL, NULL, "Karsten Weiss", NULL},
{NULL, NULL, "Jochen Kemnade", NULL},
+ {N_("Australian English"), "en_AU", "Peter Lawler", NULL}, {N_("British English"), "en_GB", "Luke Ross", NULL},
{N_("Spanish"), "es", "JM Pérez Cáncer", NULL},
{NULL, NULL, "Nicolás Lichtmaier", NULL},
@@ -311,6 +314,7 @@
{NULL, NULL, "Petter Johan Olsen", NULL},
{NULL, NULL, "Espen Stefansen", NULL},
{N_("Dutch, Flemish"), "nl", "Vincent van Adrighem", NULL},
+ {N_("Occitan"), "oc", "Yannig Marchegay", NULL}, {N_("Polish"), "pl", "Krzysztof Foltman", NULL},
{NULL, NULL, "Paweł Godlewski", NULL},
{NULL, NULL, "Piotr Makowski", NULL},