/pidgin/main: a324d01ba1c5: Manual merge. Only 1 easy conflict i...
Mark Doliner
mark at kingant.net
Wed Oct 22 10:20:24 EDT 2014
Changeset: a324d01ba1c56c16beee8c15145591ec0d2af6fb
Author: Mark Doliner <mark at kingant.net>
Date: 2014-04-12 22:28 -0700
Branch: release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/a324d01ba1c5
Description:
Manual merge. Only 1 easy conflict in ChangeLog.
diffstat:
ChangeLog | 2 +
libpurple/internal.h | 3 +
libpurple/protocols/gg/lib/events.c | 11 +-
libpurple/protocols/gg/lib/internal.h | 12 +-
libpurple/protocols/gg/lib/libgadu.h | 2 +-
libpurple/protocols/gg/lib/network.h | 2 +
libpurple/protocols/gg/lib/protobuf-c.c | 6 +-
libpurple/protocols/gg/lib/sha1.c | 16 +-
libpurple/protocols/yahoo/libymsg.c | 2 +-
libpurple/protocols/yahoo/libymsg.h | 2 +-
libpurple/win32/global.mak | 2 +-
libpurple/win32/wpurpleerror.h | 25 ++
pidgin/gtkdialogs.c | 3 +-
po/de.po | 310 ++++++++++++++++---------------
14 files changed, 225 insertions(+), 173 deletions(-)
diffs (truncated from 654 to 300 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ version 2.10.10 (?/?/?):
* Don't allow overwriting arbitrary files on the file system when the
user installs a smiley theme via drag-and-drop. (Discovered by Yves
Younan of Sourcefire VRT)
+ * Updates to dependencies:
+ * NSS 3.16 and NSPR 4.10.4
Finch:
* Fix build against Python 3. (Ed Catmur) (#15969)
diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -47,6 +47,9 @@
*/
#ifdef ENABLE_NLS
# include <locale.h>
+# ifndef __APPLE_CC__
+# define __APPLE_CC__ 0
+# endif
# include <libintl.h>
# define _(String) ((const char *)dgettext(PACKAGE, String))
# ifdef gettext_noop
diff --git a/libpurple/protocols/gg/lib/events.c b/libpurple/protocols/gg/lib/events.c
--- a/libpurple/protocols/gg/lib/events.c
+++ b/libpurple/protocols/gg/lib/events.c
@@ -588,6 +588,7 @@ static gg_action_t gg_handle_resolving(s
int count = -1;
int res;
unsigned int i;
+ struct in_addr *addrs;
res = gg_resolver_recv(sess->fd, buf, sizeof(buf));
@@ -622,8 +623,10 @@ static gg_action_t gg_handle_resolving(s
/* 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) {
count = i;
break;
}
@@ -661,7 +664,7 @@ static gg_action_t gg_handle_resolving(s
if (i > 0)
len += 2;
- len += strlen(inet_ntoa(((struct in_addr*) sess->recv_buf)[i]));
+ len += strlen(inet_ntoa(addrs[i]));
}
list = malloc(len + 1);
@@ -675,7 +678,7 @@ static gg_action_t gg_handle_resolving(s
if (i > 0)
strcat(list, ", ");
- 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 @@ static gg_action_t gg_handle_resolving(s
gg_close(sess);
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;
sess->recv_buf = NULL;
diff --git a/libpurple/protocols/gg/lib/internal.h b/libpurple/protocols/gg/lib/internal.h
--- a/libpurple/protocols/gg/lib/internal.h
+++ b/libpurple/protocols/gg/lib/internal.h
@@ -28,17 +28,23 @@
#ifdef _WIN32
# define GG_SIZE_FMT "Iu"
+# define _GG_INT64_MODIFIER "I64"
+#elif defined(_LP64)
+# define GG_SIZE_FMT "zu"
+# define _GG_INT64_MODIFIER "l"
#else
# define GG_SIZE_FMT "zu"
+# define _GG_INT64_MODIFIER "ll"
#endif
+
#ifndef PRIu64
-# define PRIu64 "llu"
+# define PRIu64 _GG_INT64_MODIFIER "u"
#endif
#ifndef PRIx64
-# define PRIx64 "llx"
+# define PRIx64 _GG_INT64_MODIFIER "x"
#endif
#ifndef PRId64
-# define PRId64 "lld"
+# define PRId64 _GG_INT64_MODIFIER "d"
#endif
#define GG_LOGIN_PARAMS_HAS_FIELD(glp, member) \
diff --git a/libpurple/protocols/gg/lib/libgadu.h b/libpurple/protocols/gg/lib/libgadu.h
--- a/libpurple/protocols/gg/lib/libgadu.h
+++ b/libpurple/protocols/gg/lib/libgadu.h
@@ -283,7 +283,7 @@ struct gg_session {
int initial_status; /**< PoczÄ
tkowy status */
int status; /**< Aktualny status */
- char *recv_buf; /**< Bufor na odbierany pakiety */
+ char *recv_buf; /**< Bufor na odbierane pakiety. Wskaźnik zawsze maksymalnie wyrównany, tak jak w wyniku działania \c malloc(). */
int recv_done; /**< Liczba wczytanych bajtów pakietu */
int recv_left; /**< Liczba pozostałych do wczytania bajtów pakietu */
diff --git a/libpurple/protocols/gg/lib/network.h b/libpurple/protocols/gg/lib/network.h
--- a/libpurple/protocols/gg/lib/network.h
+++ b/libpurple/protocols/gg/lib/network.h
@@ -31,6 +31,8 @@
#ifdef _WIN32
# include <ws2tcpip.h>
# include <winsock2.h>
+# include <stdlib.h>
+# include <stdio.h>
# include <errno.h>
/* Obecnie na Win32 tylko MSVC definiuje te typy błędów. Na wypadek, gdyby
* jednak Cygwin bÄ
dź MinGW zaczęły je definiować, używamy bardziej ogólnych
diff --git a/libpurple/protocols/gg/lib/protobuf-c.c b/libpurple/protocols/gg/lib/protobuf-c.c
--- a/libpurple/protocols/gg/lib/protobuf-c.c
+++ b/libpurple/protocols/gg/lib/protobuf-c.c
@@ -919,7 +919,7 @@ repeated_field_pack (const ProtobufCFiel
const void *member,
uint8_t *out)
{
- char *array = * (char * const *) member;
+ void *array = * (char * const *) member;
unsigned i;
if (field->packed)
{
@@ -1024,7 +1024,7 @@ repeated_field_pack (const ProtobufCFiel
for (i = 0; i < count; i++)
{
rv += required_field_pack (field, array, out + rv);
- array += siz;
+ array = ((char*)array) + siz;
}
return rv;
}
@@ -1902,7 +1902,7 @@ parse_packed_repeated_member (ScannedMem
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;
size_t count = 0;
diff --git a/libpurple/protocols/gg/lib/sha1.c b/libpurple/protocols/gg/lib/sha1.c
--- a/libpurple/protocols/gg/lib/sha1.c
+++ b/libpurple/protocols/gg/lib/sha1.c
@@ -88,13 +88,13 @@ static int SHA1_Final(unsigned char dige
/* blk0() and blk() perform the initial expand. */
/* I got the idea of expanding during the round function from SSLeay */
#ifndef GG_CONFIG_BIGENDIAN
-#define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) \
- |(rol(block->l[i], 8) & 0x00FF00FF))
+#define blk0(i) (block.l[i] = (rol(block.l[i], 24) & 0xFF00FF00) \
+ |(rol(block.l[i], 8) & 0x00FF00FF))
#else
-#define blk0(i) block->l[i]
+#define blk0(i) block.l[i]
#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
- ^block->l[(i+2)&15]^block->l[i&15], 1))
+#define blk(i) (block.l[i&15] = rol(block.l[(i+13)&15]^block.l[(i+8)&15] \
+ ^block.l[(i+2)&15]^block.l[i&15], 1))
/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
/* style:comma:start-ignore */
@@ -115,10 +115,8 @@ typedef union {
unsigned char c[64];
uint32_t l[16];
} CHAR64LONG16;
-CHAR64LONG16* block;
-static unsigned char workspace[64];
- block = (CHAR64LONG16*)workspace;
- memcpy(block, buffer, 64);
+ CHAR64LONG16 block;
+ memcpy(&block, buffer, sizeof(block));
/* Copy context->state[] to working vars */
a = state[0];
b = state[1];
diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -4560,7 +4560,7 @@ static void yahoo_show_act_id(PurplePlug
fields = purple_request_fields_new();
group = purple_request_field_group_new(NULL);
purple_request_fields_add_group(fields, group);
- field = purple_request_field_choice_new("id", "Activate which ID?", 0);
+ field = purple_request_field_choice_new("id", _("Activate which ID?"), 0);
purple_request_field_group_add_field(group, field);
for (iter = 0; yd->profiles[iter]; iter++) {
diff --git a/libpurple/protocols/yahoo/libymsg.h b/libpurple/protocols/yahoo/libymsg.h
--- a/libpurple/protocols/yahoo/libymsg.h
+++ b/libpurple/protocols/yahoo/libymsg.h
@@ -30,7 +30,7 @@
#include "prpl.h"
#include "network.h"
-#define YAHOO_PAGER_HOST_REQ_URL "http://vcs1.msg.yahoo.com/capacity"
+#define YAHOO_PAGER_HOST_REQ_URL "http://vcs2.msg.yahoo.com/capacity"
#define YAHOO_PAGER_HOST_FALLBACK "scsa.msg.yahoo.com"
#define YAHOO_PAGER_PORT 5050
#define YAHOO_PAGER_PORT_P2P 5101
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -17,7 +17,7 @@ GTK_BIN ?= $(GTK_TOP)/bin
BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.0
MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.15.4-nspr-4.10.2
+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.16-nspr-4.10.4
PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
diff --git a/libpurple/win32/wpurpleerror.h b/libpurple/win32/wpurpleerror.h
--- a/libpurple/win32/wpurpleerror.h
+++ b/libpurple/win32/wpurpleerror.h
@@ -27,32 +27,57 @@
/* Here we define unix socket errors as windows socket errors */
+#undef ENETDOWN
#define ENETDOWN WSAENETDOWN
+#undef EAFNOSUPPORT
#define EAFNOSUPPORT WSAEAFNOSUPPORT
+#undef EINPROGRESS
#define EINPROGRESS WSAEINPROGRESS
+#undef ENOBUFS
#define ENOBUFS WSAENOBUFS
+#undef EPROTONOSUPPORT
#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
+#undef EPROTOTYPE
#define EPROTOTYPE WSAEPROTOTYPE
+#undef ESOCKTNOSUPPORT
#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
+#undef EADDRINUSE
#define EADDRINUSE WSAEADDRINUSE
+#undef EINPROGRESS
#define EINPROGRESS WSAEINPROGRESS
+#undef EALREADY
#define EALREADY WSAEALREADY
+#undef EADDRNOTAVAIL
#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#undef ECONNREFUSED
#define ECONNREFUSED WSAECONNREFUSED
+#undef EISCONN
#define EISCONN WSAEISCONN
+#undef ENETUNREACH
#define ENETUNREACH WSAENETUNREACH
+#undef ENOTSOCK
#define ENOTSOCK WSAENOTSOCK
+#undef ETIMEDOUT
#define ETIMEDOUT WSAETIMEDOUT
+#undef EWOULDBLOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
+#undef ENOTCONN
#define ENOTCONN WSAENOTCONN
+#undef ENETRESET
#define ENETRESET WSAENETRESET
+#undef EOPNOTSUPP
#define EOPNOTSUPP WSAEOPNOTSUPP
+#undef ESHUTDOWN
#define ESHUTDOWN WSAESHUTDOWN
+#undef EMSGSIZE
#define EMSGSIZE WSAEMSGSIZE
+#undef ECONNABORTED
#define ECONNABORTED WSAECONNABORTED
+#undef ECONNRESET
#define ECONNRESET WSAECONNRESET
+#undef EHOSTUNREACH
#define EHOSTUNREACH WSAEHOSTUNREACH
#endif /* end _WPURPLEERROR_H */
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -171,7 +171,7 @@ static const struct translator translato
{N_("Dzongkha"), "dz", "Wangmo Sherpa", "rinwanshe at yahoo.com"},
{N_("Greek"), "el", "Katsaloulis Panayotis", "panayotis at panayotis.com"},
{N_("Greek"), "el", "Panos Bouklis", "panos at echidna-band.com"},
- {N_("Australian English"), "en_AU", "Peter Lawler", "trans at six-by-nine.com.au"},
+ {N_("Australian English"), "en_AU", "Michael Findlay", "keltoiboy at gmail.com"},
More information about the Commits
mailing list