[Commits] [SCM] claws branch, master, updated. 3.9.2-22-g909c07b

[mones at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  909c07b43080aae23c02f382de3532e98e29d66d (commit)
       via  a49c1b5498e8acc34ffaf21bee2169c458c62932 (commit)
      from  70a2b10ce5ca4c072d66b4ea84591ad30166a59a (commit)


- Log -----------------------------------------------------------------
commit 909c07b43080aae23c02f382de3532e98e29d66d
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jun 14 12:29:46 2013 +0200

    Use the correct type for adjustments
    
    Fixes “addrgather.c:402:12: warning: assignment from incompatible
    pointer type [enabled by default]”

diff --git a/src/addrgather.c b/src/addrgather.c
index fc04382..99ed70b 100644
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -324,7 +324,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl)
 #ifndef USE_NEW_ADDRBOOK
 	GtkWidget *hboxs;
 	GtkWidget *spinbtnFolder;
-	GtkWidget *adjFolder;
+	GtkAdjustment *adjFolder;
 #endif
 	GtkWidget *checkRecurse;
 	gint top;
@@ -399,7 +399,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl)
 			_("Maximum amount of entries per folder within the newly created address book"));
 
 	hboxs = gtk_hbox_new(FALSE, 8);
-	adjFolder = gtk_adjustment_new(DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 0);
+	adjFolder = GTK_ADJUSTMENT(gtk_adjustment_new(DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 0));
 	spinbtnFolder = gtk_spin_button_new(GTK_ADJUSTMENT(adjFolder), 1, 0);
 	gtk_box_pack_start(GTK_BOX(hboxs), spinbtnFolder, FALSE, FALSE, 0);
 	gtk_widget_set_size_request(spinbtnFolder, 100, -1);

commit a49c1b5498e8acc34ffaf21bee2169c458c62932
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jun 14 12:24:47 2013 +0200

    Deprecated gthread functions in newer glib
    
    Since glib 2.32 these are deprecated:
    • g_thread_init is not required anymore
    • g_cond_new/g_cond_free → g_cond_init/g_cond_clear

diff --git a/src/main.c b/src/main.c
index f51b36f..451eac9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1039,8 +1039,10 @@ int main(int argc, char *argv[])
 	
 	if (cmd.exit)
 		return 0;
+#if !GLIB_CHECK_VERSION(2,32,0)
 	if (!g_thread_supported())
 		g_thread_init(NULL);
+#endif
 
 	reset_statistics();
 	
diff --git a/src/prefs_account.c b/src/prefs_account.c
index b49ebea..32eeeed 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -3367,7 +3367,11 @@ static gboolean sslcert_get_password(gpointer source, gpointer data)
 { 
 	struct GetPassData pass_data;
 	/* do complicated stuff to be able to call GTK from the mainloop */
+#if !GLIB_CHECK_VERSION(2,32,0)
 	pass_data.cond = g_cond_new();
+#else
+	g_cond_init(pass_data.cond);
+#endif
 	pass_data.mutex = cm_mutex_new();
 	pass_data.pass = (gchar **)source;
 
@@ -3376,7 +3380,11 @@ static gboolean sslcert_get_password(gpointer source, gpointer data)
 	g_idle_add(do_get_pass, &pass_data);
 
 	g_cond_wait(pass_data.cond, pass_data.mutex);
+#if !GLIB_CHECK_VERSION(2,32,0)
 	g_cond_free(pass_data.cond);
+#else
+	g_cond_clear(pass_data.cond);
+#endif
 	g_mutex_unlock(pass_data.mutex);
 	cm_mutex_free(pass_data.mutex);
 

-----------------------------------------------------------------------

Summary of changes:
 src/addrgather.c    |    4 ++--
 src/main.c          |    2 ++
 src/prefs_account.c |    8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Claws Mail