/pidgin/main: d9a333109990: Update libgadu to the current git ve...

[Tomasz Wasilczyk]

Changeset: d9a3331099908fae54c4d9ead889bd82f2acf732
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-16 18:27 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/d9a333109990

Description:

Update libgadu to the current git version

diffstat:

 libpurple/protocols/gg/lib/common.c   |   2 +-
 libpurple/protocols/gg/lib/config.h   |   2 +-
 libpurple/protocols/gg/lib/libgadu.c  |   5 ++++-
 libpurple/protocols/gg/lib/message.h  |  10 +++++++---
 libpurple/protocols/gg/lib/protocol.h |  10 +++++-----
 5 files changed, 18 insertions(+), 11 deletions(-)

diffs (97 lines):

diff --git a/libpurple/protocols/gg/lib/common.c b/libpurple/protocols/gg/lib/common.c
--- a/libpurple/protocols/gg/lib/common.c
+++ b/libpurple/protocols/gg/lib/common.c
@@ -751,7 +751,7 @@ int gg_chat_update(struct gg_session *se
 	gg_chat_list_t *chat;
 	uin_t *participants_new;
 
-	if (participants_count >= ~0 / sizeof(uin_t))
+	if (participants_count >= ~(unsigned int)0 / sizeof(uin_t))
 		return -1;
 
 	chat = gg_chat_find(sess, id);
diff --git a/libpurple/protocols/gg/lib/config.h b/libpurple/protocols/gg/lib/config.h
--- a/libpurple/protocols/gg/lib/config.h
+++ b/libpurple/protocols/gg/lib/config.h
@@ -5,7 +5,7 @@
 /* libpurple's config */
 #include <config.h>
 
-#define GG_LIBGADU_VERSION "1.12.0-rc2"
+#define GG_LIBGADU_VERSION "1.12.0-dev"
 
 /* Defined if libgadu was compiled for bigendian machine. */
 #undef GG_CONFIG_BIGENDIAN
diff --git a/libpurple/protocols/gg/lib/libgadu.c b/libpurple/protocols/gg/lib/libgadu.c
--- a/libpurple/protocols/gg/lib/libgadu.c
+++ b/libpurple/protocols/gg/lib/libgadu.c
@@ -2550,8 +2550,11 @@ int gg_chat_invite(struct gg_session *gs
 	if (!gg_required_proto(gs, GG_PROTOCOL_VERSION_110))
 		return -1;
 
-	if (participants_count == 0 || participants_count >= ~0 / sizeof(struct gg_chat_participant))
+	if (participants_count == 0 || participants_count >=
+		~(unsigned int)0 / sizeof(struct gg_chat_participant))
+	{
 		return -1;
+	}
 
 	participants_list_size = sizeof(struct gg_chat_participant) *
 		participants_count;
diff --git a/libpurple/protocols/gg/lib/message.h b/libpurple/protocols/gg/lib/message.h
--- a/libpurple/protocols/gg/lib/message.h
+++ b/libpurple/protocols/gg/lib/message.h
@@ -45,12 +45,16 @@ struct gg_message {
 		return (result); \
 	}
 
-int gg_message_init(gg_message_t *gm, int msgclass, int seq, uin_t *recipients, size_t recipient_count, char *text, char *xhtml, char *attributes, size_t attributes_length, int auto_convert);
+int gg_message_init(gg_message_t *gm, int msgclass, int seq, uin_t *recipients,
+	size_t recipient_count, char *text, char *xhtml, char *attributes,
+	size_t attributes_length, int auto_convert);
 
 #endif
 
-size_t gg_message_html_to_text(char *dst, unsigned char *format, size_t *format_len, const char *html, gg_encoding_t encoding);
-size_t gg_message_text_to_html(char *dst, const char *src, gg_encoding_t encoding, const unsigned char *format, size_t format_len);
+size_t gg_message_html_to_text(char *dst, unsigned char *format,
+	size_t *format_len, const char *html, gg_encoding_t encoding);
+size_t gg_message_text_to_html(char *dst, const char *src,
+	gg_encoding_t encoding, const unsigned char *format, size_t format_len);
 
 char * gg_message_html_to_text_110(const char *html);
 char * gg_message_text_to_html_110(const char *text, ssize_t text_len);
diff --git a/libpurple/protocols/gg/lib/protocol.h b/libpurple/protocols/gg/lib/protocol.h
--- a/libpurple/protocols/gg/lib/protocol.h
+++ b/libpurple/protocols/gg/lib/protocol.h
@@ -40,7 +40,7 @@
 #undef GG_FEATURE_STATUS80
 #define GG_FEATURE_STATUS80BETA		0x01
 #define GG_FEATURE_MSG80		0x02
-#define GG_FEATURE_STATUS80 		0x05
+#define GG_FEATURE_STATUS80		0x05
 
 #define GG_DEFAULT_HOST_WHITE_LIST { "gadu-gadu.pl", "gg.pl", NULL }
 
@@ -224,8 +224,8 @@ struct gg_dcc7_aborted {
 
 struct gg_dcc7_voice_auth {
 	uint8_t type;			/* 0x00 -> wysylanie ID
-					   0x01 -> potwierdzenie ID
-					*/
+					 * 0x01 -> potwierdzenie ID
+					 */
 	gg_dcc7_id_t id;		/* identyfikator poÅ‚Ä
czenia */
 	uint32_t reserved1;		/* GG_DCC7_RESERVED1 */
 	uint32_t reserved2;		/* GG_DCC7_RESERVED2 */
@@ -270,8 +270,8 @@ struct gg_dcc7_voice_init_confirm {
 struct gg_dcc7_relay_req {
 	uint32_t magic;			/* 0x0a */
 	uint32_t len;			/* długość całego pakietu */
-	gg_dcc7_id_t id;   		/* identyfikator poÅ‚Ä
czenia */
-	uint16_t type;   		/* typ zapytania */
+	gg_dcc7_id_t id;		/* identyfikator poÅ‚Ä
czenia */
+	uint16_t type;			/* typ zapytania */
 	uint16_t dunno1;		/* 0x02 */
 } GG_PACKED;