diff --git a/gtk/main.c b/gtk/main.c
index 6e7ca02..76ead50 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1643,7 +1643,9 @@ int main(int argc, char *argv[]){
 	GdkPixbuf *pbuf;
 	const char *app_name="Linphone";
 
+#if !GLIB_CHECK_VERSION(2, 31, 0)
 	g_thread_init(NULL);
+#endif
 	gdk_threads_init();
 	
 	progpath = strdup(argv[0]);
diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 1c54fca..ae1bcfa 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -270,7 +270,11 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) {
 	linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
 
 	if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
+#if !GLIB_CHECK_VERSION(2, 31, 0)
 		g_thread_create(check_username_availability, (void*)w, FALSE, NULL);
+#else
+		g_thread_new(NULL, check_username_availability, w);
+#endif
 	}
 	else {
 		if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
@@ -534,7 +538,9 @@ GtkWidget * linphone_gtk_create_assistant(void){
 	ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
 	notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
 
+#if !GLIB_CHECK_VERSION(2, 31, 0)
 	g_thread_init (NULL);
+#endif
 	gdk_threads_init ();
 
 	GtkWidget *p1=create_intro();