[balsa] libnm-glib portability fixes.

[Pawel Salek <pawels src gnome org>]

commit ac6c74361881241e78cfa171f0a0ea7f8625dab8
Author: Pawel Salek <pawsa damage localdomain>
Date:   Thu Nov 12 23:20:53 2009 +0100

    libnm-glib portability fixes.
    
    * libbalsa/imap/imap-handle.c: fix a corner case locking problem.
    * src/main-window.c: remove a warning.
    * configure.in: work around lib rename.

 ChangeLog                   |    6 ++++++
 configure.in                |    9 +++++----
 libbalsa/imap/imap-handle.c |    8 ++++----
 src/main-window.c           |    3 ++-
 4 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bb4bb5a..7a1f757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-12  Pawel Salek
+
+	* libbalsa/imap/imap-handle.c: fix a corner case locking problem.
+	* src/main-window.c: remove a warning.
+	* configure.in: work around lib rename.
+
 2009-11-11  Pawel Salek
 
 	* configure.in: add NetworkManager-glib support.
diff --git a/configure.in b/configure.in
index b3a2f06..70b5928 100644
--- a/configure.in
+++ b/configure.in
@@ -727,15 +727,16 @@ if test x$with_libnotify != xno; then
 fi
 
 # NetworkManager
-AC_MSG_CHECKING([NetworkManager-glib-devel])
-echo withnm "'$with_nm'"
 if test "$with_nm" != no ; then
-  PKG_CHECK_MODULES(LIBNM_GLIB, [ libnm_glib ])
+  PKG_CHECK_EXISTS([libnm-glib], 
+  [ PKG_CHECK_MODULES(LIBNM_GLIB, [ libnm-glib ]) ],
+  [ PKG_CHECK_MODULES(LIBNM_GLIB, [ libnm_glib ]) ])
+
   AC_DEFINE(HAVE_LIBNM_GLIB,1,[ Defined if NetworkManager-glib-devel is found.])
   CFLAGS="$CFLAGS $LIBNM_GLIB_CFLAGS"
   LIBS="$LIBS $LIBNM_GLIB_LIBS"
-  AC_MSG_RESULT([yes])
 else
+AC_MSG_CHECKING([NetworkManager-glib-devel])
  AC_MSG_RESULT([no])
 fi
 
diff --git a/libbalsa/imap/imap-handle.c b/libbalsa/imap/imap-handle.c
index c32c5d5..7ae8b63 100644
--- a/libbalsa/imap/imap-handle.c
+++ b/libbalsa/imap/imap-handle.c
@@ -588,6 +588,7 @@ imap_mbox_handle_connect(ImapMboxHandle* ret, const char *host, int over_ssl)
 #if !defined(USE_TLS)
   if(over_ssl) {
     imap_mbox_handle_set_msg(ret,"SSL requested but SSL support not compiled");
+    HANDLE_UNLOCK(ret);
     return IMAP_UNSECURE;
   }
 #else
@@ -596,10 +597,9 @@ imap_mbox_handle_connect(ImapMboxHandle* ret, const char *host, int over_ssl)
 
   g_free(ret->host);   ret->host   = g_strdup(host);
 
-  if( (rc=imap_mbox_connect(ret)) != IMAP_SUCCESS)
-    return rc;
-
-  rc = imap_authenticate(ret);
+  if( (rc=imap_mbox_connect(ret)) == IMAP_SUCCESS) {
+    rc = imap_authenticate(ret);
+  }
 
   HANDLE_UNLOCK(ret);
 
diff --git a/src/main-window.c b/src/main-window.c
index f5095e5..8087d75 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -3416,10 +3416,11 @@ bw_display_new_mail_notification(int num_new, int has_new)
 /*Callback to create or disconnect an IMAP mbox. */
 static gboolean
 mw_mbox_change_connection_status(GtkTreeModel * model, GtkTreePath * path,
-                      GtkTreeIter * iter, gboolean is_connected)
+                                 GtkTreeIter * iter, gpointer arg)
 {
     BalsaMailboxNode *mbnode;
     LibBalsaMailbox *mailbox;
+    gboolean is_connected = GPOINTER_TO_INT(arg);
 
     gtk_tree_model_get(model, iter, 0, &mbnode, -1);
     g_return_val_if_fail(mbnode, FALSE);