/pidgin/main: 3ab780c31f66: Correct libgadu merge from release-2...

[Tomasz Wasilczyk]

Changeset: 3ab780c31f6644326f77c0ed0e3fbd6dd8c16d33
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-03 19:16 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/3ab780c31f66

Description:

Correct libgadu merge from release-2.x.y

diffstat:

 libpurple/protocols/gg/lib/common.c |  6 +++---
 libpurple/protocols/gg/lib/config.h |  2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 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
@@ -837,12 +837,12 @@ void gg_strarr_free(char **strarr)
 
 char ** gg_strarr_dup(char **strarr)
 {
+	size_t i, len, size;
+	char **it, **out;
+
 	if (strarr == NULL)
 		return NULL;
 
-	size_t i, len, size;
-	char **it, **out;
-
 	len = 0;
 	for (it = strarr; *it != NULL; it++)
 		len++;
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-dev"
+#define GG_LIBGADU_VERSION "1.12.0-rc2"
 
 /* Defined if libgadu was compiled for bigendian machine. */
 #undef GG_CONFIG_BIGENDIAN