changeset:   597:a154bccf7438

user:        huzheng001@gmail.com

date:        Wed Apr 17 11:04:12 2013 +0800

diff -r f9712771e445 -r a154bccf7438 dict/configure.ac

--- a/dict/configure.ac	Fri Mar 29 07:30:29 2013 +0800

+++ b/dict/configure.ac	Wed Apr 17 11:04:12 2013 +0800

@@ -280,15 +280,15 @@

 AM_CONDITIONAL(DARWIN_SUPPORT, test "x${enable_darwin_support}" = "xyes")

 if test "x${enable_gpe_support}" = "xyes" ; then

-  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gthread-2.0 libgpewidget >= 0.109"

+  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 libgpewidget >= 0.109"

 elif test "x${enable_maemo_support}" = "xyes" ; then

-  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gthread-2.0 gconf-2.0 >= 2.6 hildon-libs >= 0.12"

+  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 gconf-2.0 >= 2.6 hildon-libs >= 0.12"

 elif test "x${enable_darwin_support}" = "xyes" ; then

-  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gthread-2.0"

+  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0"

 elif test "x${enable_gnome_support}" = "xno" ; then

-  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gthread-2.0"

+  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0"

 else

-  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gthread-2.0 libgnome-2.0 libbonobo-2.0 gconf-2.0"

+  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.32 gmodule-2.0 gthread-2.0 libgnome-2.0 libbonobo-2.0 gconf-2.0"

 fi

 dnl

diff -r f9712771e445 -r a154bccf7438 dict/src/desktop.cpp

--- a/dict/src/desktop.cpp	Fri Mar 29 07:30:29 2013 +0800

+++ b/dict/src/desktop.cpp	Wed Apr 17 11:04:12 2013 +0800

@@ -262,6 +262,7 @@

 			GTK_DIALOG_MODAL,

 			GTK_MESSAGE_WARNING,

 			GTK_BUTTONS_YES_NO,

+			"%s",

 			msg);

 	bool confirmed = false;

 	gint response = gtk_dialog_run (GTK_DIALOG (dialog));

diff -r f9712771e445 -r a154bccf7438 dict/src/lib/sockets.cpp

--- a/dict/src/lib/sockets.cpp	Fri Mar 29 07:30:29 2013 +0800

+++ b/dict/src/lib/sockets.cpp	Wed Apr 17 11:04:12 2013 +0800

@@ -239,7 +239,7 @@

 	query_data->host = host;

 	query_data->data = data;

 	query_data->func = func;

-	g_thread_create(dns_thread, query_data, FALSE, NULL);

+	g_thread_unref(g_thread_new("dns_thread", dns_thread, query_data));

 }

 void Socket::connect(int socket, in_addr_t sa, int port, gpointer data, on_connected_func func)

@@ -250,7 +250,7 @@

 	connect_data->port = port;

 	connect_data->data = data;

 	connect_data->func = func;

-	g_thread_create(connect_thread, connect_data, FALSE, NULL);

+	g_thread_unref(g_thread_new("connect_thread", connect_thread, connect_data));

 }

 gpointer Socket::connect_thread(gpointer data)

diff -r f9712771e445 -r a154bccf7438 dict/src/stardict.cpp

--- a/dict/src/stardict.cpp	Fri Mar 29 07:30:29 2013 +0800

+++ b/dict/src/stardict.cpp	Wed Apr 17 11:04:12 2013 +0800

@@ -2311,7 +2311,6 @@

 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");

 	textdomain (GETTEXT_PACKAGE);

-	g_thread_init (NULL);

 #if defined(_WIN32) && defined(_MSC_VER)

 	synchronize_crt_enviroment();

 #endif

diff -r f9712771e445 -r a154bccf7438 lib/configure.ac

--- a/lib/configure.ac	Fri Mar 29 07:30:29 2013 +0800

+++ b/lib/configure.ac	Wed Apr 17 11:04:12 2013 +0800

@@ -26,7 +26,7 @@

 # Checks for typedefs, structures, and compiler characteristics.

 # Checks for library functions.

-DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.8 zlib libxml-2.0 >= 2.5"

+DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.8 gmodule-2.0 zlib libxml-2.0 >= 2.5"

 PKG_CHECK_MODULES(STARDICT, $DEP_MODULES)

 AC_ARG_ENABLE([deprecations],

diff -r f9712771e445 -r a154bccf7438 lib/src/libcommon.h

--- a/lib/src/libcommon.h	Fri Mar 29 07:30:29 2013 +0800

+++ b/lib/src/libcommon.h	Wed Apr 17 11:04:12 2013 +0800

@@ -188,7 +188,11 @@

 }

 namespace zip {

+#if ZLIB_VERNUM > 0x1250

+typedef ResourceWrapper<gzFile_s, gzFile, int, gzclose> gzFile;

+#else

 typedef ResourceWrapper<void, void*, int, gzclose> gzFile;

+#endif

 }

 /* Create a new temporary file. Return file name in file name encoding.