Mercurial > pidgin
changeset 29917:af5a46ecfb24
merge of '52fb5cb4cd8795906a7313dd5edde763a4848a3e'
and '884d44222e8c81ecec51c25e07d005e002a5479b'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Wed, 12 May 2010 05:15:44 +0000 |
| parents | 94c380160595 (current diff) a40c55113f7d (diff) |
| children | e63ea24aa291 |
| files | |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/gg/Makefile.am Wed May 12 05:00:06 2010 +0000 +++ b/libpurple/protocols/gg/Makefile.am Wed May 12 05:15:44 2010 +0000 @@ -9,6 +9,7 @@ lib/http.c \ lib/libgadu.c \ lib/libgadu-config.h \ + lib/libgadu-internal.h \ lib/libgadu.h \ lib/obsolete.c \ lib/protocol.h \ @@ -30,6 +31,7 @@ lib/http.c \ lib/libgadu.c \ lib/libgadu-config.h \ + lib/libgadu-internal.h \ lib/libgadu.h \ lib/obsolete.c \ lib/protocol.h \
--- a/libpurple/tests/check_libpurple.c Wed May 12 05:00:06 2010 +0000 +++ b/libpurple/tests/check_libpurple.c Wed May 12 05:15:44 2010 +0000 @@ -37,16 +37,22 @@ static void purple_check_init(void) { - gchar *home_dir; - g_type_init(); purple_eventloop_set_ui_ops(&eventloop_ui_ops); +#if 0 /* build our fake home directory */ - home_dir = g_build_path(G_DIR_SEPARATOR_S, BUILDDIR, "libpurple", "tests", "home", NULL); - purple_util_set_user_dir(home_dir); - g_free(home_dir); + { + gchar *home_dir; + + home_dir = g_build_path(G_DIR_SEPARATOR_S, BUILDDIR, "libpurple", "tests", "home", NULL); + purple_util_set_user_dir(home_dir); + g_free(home_dir); + } +#else + purple_util_set_user_dir("/dev/null"); +#endif purple_core_init("check"); }