[balsa] Release balsa-2.4.14 buildable on fedora rawhide

[Pawel Salek <pawels src gnome org>]

commit f70a8ca9796e1beeff64bc39152ae917bb39f2be
Author: Pawel Salek <pawsa0 gmail com>
Date:   Thu Feb 14 21:48:12 2013 +0100

    Release balsa-2.4.14 buildable on fedora rawhide

 ChangeLog                     |    8 ++++++++
 NEWS                          |    8 ++++++--
 configure.in                  |    3 +--
 libbalsa/imap-server.c        |   12 ++++++------
 libbalsa/libbalsa-conf.c      |   10 +++++++---
 libbalsa/mime-stream-shared.c |   20 ++++++++++----------
 src/main.c                    |    2 --
 7 files changed, 38 insertions(+), 25 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 79f74df..1592ce7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-14  Pawel Salek
+
+       * NEWS, configure.in: release balsa-2.4.14 buildable on fedora rawhide.
+       * libbalsa/imap-server.c:
+       * libbalsa/libbalsa-conf.c: replace deprecacted gthreads API.
+       * libbalsa/mime-stream-shared.c: 
+       * src/main.c: ditto.
+
 2012-10-29  Pawel Salek
 
        * NEWS, configure.in: release balsa-2.4.13
diff --git a/NEWS b/NEWS
index aacc35a..e85b494 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
-* Balsa-2.4.12 release. Release date 2012-10-29
+* Balsa-2.4.14 release. Release date 2013-02-14
+
+- drop legacy gnome-icons-theme dependency.
+
+* Balsa-2.4.13 release. Release date 2012-10-29
 
 - fix long-line POP3 bug.
 - fix bugs 684124,
 
-* Balsa-2.4.11 release. Release date 2012-04-21
+* Balsa-2.4.12 release. Release date 2012-04-21
 
 - GPGME fixes.
 - building GPG with gmime-2.6.0
diff --git a/configure.in b/configure.in
index 8d92d9e..59cf164 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl ###########################################################################
 dnl Boilerplace and versioning
 dnl ###########################################################################
 
-AC_INIT([balsa], [2.4.13], [])
+AC_INIT([balsa], [2.4.14], [])
 AM_INIT_AUTOMAKE
 AC_LANG([C])
 # Automake-1.11 option for less verbose output
@@ -329,7 +329,6 @@ gtk+-2.0 >= 2.14.0
 gmime-$with_gmime
 gio-2.0
 gthread-2.0
-gnome-icon-theme
 $gnome_extras
 ])
 
diff --git a/libbalsa/imap-server.c b/libbalsa/imap-server.c
index 00c05e1..03217c3 100644
--- a/libbalsa/imap-server.c
+++ b/libbalsa/imap-server.c
@@ -65,7 +65,7 @@ struct LibBalsaImapServer_ {
     gboolean offline_mode;
     
 #if defined(BALSA_USE_THREADS)
-    GMutex *lock; /* protects the following members */
+    GMutex lock; /* protects the following members */
 #endif
     guint used_connections;
     GList *used_handles;
@@ -102,9 +102,9 @@ static gboolean connection_cleanup(gpointer ptr);
 static pthread_mutex_t imap_servers_lock = PTHREAD_MUTEX_INITIALIZER;
 #define LOCK_SERVERS()   pthread_mutex_lock(&imap_servers_lock)
 #define UNLOCK_SERVERS() pthread_mutex_unlock(&imap_servers_lock)
-#define LOCK_SERVER(server)    g_mutex_lock((server)->lock)
-#define TRYLOCK_SERVER(server) g_mutex_trylock((server)->lock)
-#define UNLOCK_SERVER(server)  g_mutex_unlock((server)->lock)
+#define LOCK_SERVER(server)    g_mutex_lock(&(server)->lock)
+#define TRYLOCK_SERVER(server) g_mutex_trylock(&(server)->lock)
+#define UNLOCK_SERVER(server)  g_mutex_unlock(&(server)->lock)
 #else
 #define LOCK_SERVERS()
 #define UNLOCK_SERVERS()
@@ -212,7 +212,7 @@ libbalsa_imap_server_init(LibBalsaImapServer * imap_server)
     LIBBALSA_SERVER(imap_server)->protocol = "imap";
     imap_server->key = NULL;
 #if defined(BALSA_USE_THREADS)
-    imap_server->lock = g_mutex_new();
+    g_mutex_init(&imap_server->lock);
 #endif
     imap_server->max_connections = MAX_CONNECTIONS_PER_SERVER;
     imap_server->used_connections = 0;
@@ -250,7 +250,7 @@ libbalsa_imap_server_finalize(GObject * object)
 #endif
     libbalsa_imap_server_force_disconnect(imap_server);
 #if defined(BALSA_USE_THREADS)
-    g_mutex_free(imap_server->lock);
+    g_mutex_clear(&imap_server->lock);
 #endif
     g_free(imap_server->key); imap_server->key = NULL;
 
diff --git a/libbalsa/libbalsa-conf.c b/libbalsa/libbalsa-conf.c
index b724599..e27c4b7 100644
--- a/libbalsa/libbalsa-conf.c
+++ b/libbalsa/libbalsa-conf.c
@@ -147,12 +147,16 @@ lbc_init(LibBalsaConf * conf, const gchar * filename,
 }
 
 #ifdef BALSA_USE_THREADS
-static GStaticRecMutex lbc_mutex = G_STATIC_REC_MUTEX_INIT;
+static GRecMutex lbc_mutex;
+static gsize lbc_mutex_initialized = 0;
 
 static void
 lbc_lock(void)
 {
-    g_static_rec_mutex_lock(&lbc_mutex);
+    if (g_once_init_enter(&lbc_mutex_initialized)) {
+        g_rec_mutex_lock(&lbc_mutex);
+        g_once_init_leave(&lbc_mutex_initialized, 42);
+    }
     lbc_init(&lbc_conf, "config", ".gnome2");
     lbc_init(&lbc_conf_priv, "config-private", ".gnome2_private");
 }
@@ -160,7 +164,7 @@ lbc_lock(void)
 static void
 lbc_unlock(void)
 {
-    g_static_rec_mutex_unlock(&lbc_mutex);
+    g_rec_mutex_unlock(&lbc_mutex);
 }
 #else                           /* BALSA_USE_THREADS */
 static void
diff --git a/libbalsa/mime-stream-shared.c b/libbalsa/mime-stream-shared.c
index 694af74..25eef79 100644
--- a/libbalsa/mime-stream-shared.c
+++ b/libbalsa/mime-stream-shared.c
@@ -71,8 +71,8 @@ static GMimeStream *lbmss_stream_substream(GMimeStream * stream,
                                            gint64 start, gint64 end);
 
 static GMimeStreamFsClass *parent_class = NULL;
-static GMutex *lbmss_mutex;
-static GCond *lbmss_cond;
+static GMutex lbmss_mutex;
+static GCond lbmss_cond;
 
 GType
 libbalsa_mime_stream_shared_get_type(void)
@@ -107,8 +107,8 @@ lbmss_stream_class_init(LibBalsaMimeStreamSharedClass * klass)
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
     parent_class = g_type_class_ref(GMIME_TYPE_STREAM_FS);
-    lbmss_mutex  = g_mutex_new();
-    lbmss_cond   = g_cond_new();
+    g_mutex_init(&lbmss_mutex);
+    g_cond_init(&lbmss_cond);
 
     object_class->finalize  = lbmss_finalize;
 
@@ -282,12 +282,12 @@ libbalsa_mime_stream_shared_lock(GMimeStream * stream)
     lock = stream_shared->lock;
     thread_self = g_thread_self();
 
-    g_mutex_lock(lbmss_mutex);
+    g_mutex_lock(&lbmss_mutex);
     while (lock->count > 0 && lock->thread != thread_self)
-        g_cond_wait(lbmss_cond, lbmss_mutex);
+        g_cond_wait(&lbmss_cond, &lbmss_mutex);
     ++lock->count;
     lock->thread = thread_self;
-    g_mutex_unlock(lbmss_mutex);
+    g_mutex_unlock(&lbmss_mutex);
 }
 
 /**
@@ -314,10 +314,10 @@ libbalsa_mime_stream_shared_unlock(GMimeStream * stream)
     lock = stream_shared->lock;
     g_return_if_fail(lock->count > 0);
 
-    g_mutex_lock(lbmss_mutex);
+    g_mutex_lock(&lbmss_mutex);
     if (--lock->count == 0)
-        g_cond_signal(lbmss_cond);
-    g_mutex_unlock(lbmss_mutex);
+        g_cond_signal(&lbmss_cond);
+    g_mutex_unlock(&lbmss_mutex);
 }
 
 #endif                          /* BALSA_USE_THREADS */
diff --git a/src/main.c b/src/main.c
index a966560..436452c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -662,8 +662,6 @@ pthread_mutex_t checking_mail_lock = PTHREAD_MUTEX_INITIALIZER;
 static void
 threads_init(void)
 {
-    g_thread_init(NULL);
-    
     libbalsa_threads_init();
     gdk_threads_init();