changeset
Correct libgadu merge from release-2.x.y
Thu, 03 Apr 2014 19:16:01 +0200
- author
- Tomasz Wasilczyk <twasilczyk@pidgin.im>
- date
- Thu, 03 Apr 2014 19:16:01 +0200
- changeset 35695
- 3ab780c31f66
- parent 35694
- ecf3b04c3cc2
- child 35696
- 93b8292b2779
Correct libgadu merge from release-2.x.y
| libpurple/protocols/gg/lib/common.c | file | annotate | diff | comparison | revisions | |
| libpurple/protocols/gg/lib/config.h | file | annotate | diff | comparison | revisions |
--- a/libpurple/protocols/gg/lib/common.c Thu Apr 03 19:12:34 2014 +0200 +++ b/libpurple/protocols/gg/lib/common.c Thu Apr 03 19:16:01 2014 +0200 @@ -837,12 +837,12 @@ 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++;
--- a/libpurple/protocols/gg/lib/config.h Thu Apr 03 19:12:34 2014 +0200 +++ b/libpurple/protocols/gg/lib/config.h Thu Apr 03 19:16:01 2014 +0200 @@ -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
