[balsa] Merge pancake's fixes.

[Pawel Salek <pawels src gnome org>]

commit e834f3d877a48ba689bd09f2da8142817e6415ee
Author: Pawel Salek <pawsa0 gmail com>
Date:   Sat Jan 15 11:51:06 2011 +0100

    Merge pancake's fixes.
    
    * autogen.sh: port fixes from bootstrap.sh (inspired by pancake).
    * configure.in: support libgtkhtml-3.15 lib version.
    
    * libbalsa/imap-server.c: libbalsa_imap_server_get_handle() check
      if the parameter passed is non-null (credit to pancake).
    * libbalsa/imap/imap-handle.c: zeroize released pointers (pancake).
    * libinit_balsa/assistant_page_user.c: fix widget packing (pancake).
    * src/balsa-index.c: return FALSE on failure (pancake).

 ChangeLog                           |   13 ++++++++++++-
 autogen.sh                          |    9 +++++++++
 configure.in                        |    4 +++-
 libbalsa/imap-server.c              |    2 +-
 libbalsa/imap/imap-handle.c         |    6 +++---
 libbalsa/imap/libimap.h             |   10 +++++-----
 libinit_balsa/assistant_page_user.c |    5 ++---
 src/balsa-index.c                   |    2 +-
 8 files changed, 36 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4fc4635..db17c6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-15  Pawel Salek
+
+	* autogen.sh: port fixes from bootstrap.sh (inspired by pancake).
+	* configure.in: support libgtkhtml-3.15 lib version.
+
+	* libbalsa/imap-server.c: libbalsa_imap_server_get_handle() check
+	if the parameter passed is non-null (credit to pancake).
+	* libbalsa/imap/imap-handle.c: zeroize released pointers (pancake).
+	* libinit_balsa/assistant_page_user.c: fix widget packing (pancake).
+	* src/balsa-index.c: return FALSE on failure (pancake).
+
 2010-12-09  Peter Bloomfield
 
 	* balsa.1.in: do not use macro URL; fixes gnome bz #636801.
@@ -15,7 +26,7 @@
 
 2010-11-19  Pawel Salek
 
-	* Configure.in: compile against libnotify-0.4.x as well.
+	* Configure.in: compile against libnotify-0.4.x as well. 
 
 2010-11-19  Pawel Salek
 
diff --git a/autogen.sh b/autogen.sh
index e7e7884..dfe227e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,15 @@
 echo "Running gettextize...  Ignore non-fatal messages."
 glib-gettextize --force --copy || exit 1
 echo "running intltoolize..."
+[ -d m4 ] || mkdir m4
 intltoolize --copy --force --automake || exit 1
+echo "Running gnome-doc-prepare --force - ignore errors."
+if gnome-doc-prepare --force > /dev/null 2>&1; then
+   :
+else
+    test -L gnome-doc-utils.make && rm gnome-doc-utils.make
+    touch gnome-doc-utils.make
+fi
 echo "Running libtoolize..."
 libtoolize --force || exit 1
 echo "Running aclocal..."
@@ -16,3 +24,4 @@ echo "Running automake..."
 automake --gnu --add-missing --copy || exit 1
 echo "Running configure $* ..."
 exec ./configure "$@"
+gnome-doc-tool -V > /dev/null 2>&1 || echo "gnome-doc-utils required to make dist"
diff --git a/configure.in b/configure.in
index fd4ff96..df3864b 100644
--- a/configure.in
+++ b/configure.in
@@ -403,7 +403,9 @@ case "$use_html_widget" in
     ;;
     gtkhtml3)
         AC_MSG_RESULT([$use_html_widget])
-        PKG_CHECK_MODULES(HTML, [ libgtkhtml-3.14 ])
+        PKG_CHECK_MODULES(HTML, [ libgtkhtml-3.14 ], [],
+          [PKG_CHECK_MODULES(HTML, [ libgtkhtml-3.15 ],[],
+             [AC_MSG_ERROR([*** You enabled gtkhtml3 but none of 3.14 or 3.15 libversions were found.])])])
         AC_DEFINE(HAVE_GTKHTML3,1,[Defined when GtkHtml-3 can be used.])
     ;;
     webkit)
diff --git a/libbalsa/imap-server.c b/libbalsa/imap-server.c
index a24c3b3..27af875 100644
--- a/libbalsa/imap-server.c
+++ b/libbalsa/imap-server.c
@@ -661,7 +661,7 @@ libbalsa_imap_server_get_handle(LibBalsaImapServer *imap_server, GError **err)
     struct handle_info *info = NULL;
     ImapResult rc;
 
-    if (imap_server->offline_mode)
+    if (!imap_server || imap_server->offline_mode)
         return NULL;
 
     LOCK_SERVER(imap_server);
diff --git a/libbalsa/imap/imap-handle.c b/libbalsa/imap/imap-handle.c
index 1253697..3922217 100644
--- a/libbalsa/imap/imap-handle.c
+++ b/libbalsa/imap/imap-handle.c
@@ -1019,10 +1019,10 @@ imap_mbox_handle_finalize(GObject* gobject)
   mbox_view_dispose(&handle->mbox_view);
   imap_mbox_resize_cache(handle, 0);
   g_free(handle->msg_cache); handle->msg_cache = NULL;
-  g_array_free(handle->flag_cache, TRUE);
+  g_array_free(handle->flag_cache, TRUE); handle->flag_cache = NULL;
   g_list_foreach(handle->acls, (GFunc)imap_user_acl_free, NULL);
-  g_list_free(handle->acls);
-  g_free(handle->quota_root);
+  g_list_free(handle->acls); handle->acls = NULL;
+  g_free(handle->quota_root); handle->quota_root = NULL;
 
   HANDLE_UNLOCK(handle);
 #if defined(BALSA_USE_THREADS)
diff --git a/libbalsa/imap/libimap.h b/libbalsa/imap/libimap.h
index e087d81..2b3ab6e 100644
--- a/libbalsa/imap/libimap.h
+++ b/libbalsa/imap/libimap.h
@@ -32,15 +32,15 @@ typedef enum {
 
 
 typedef enum {
-  IMAP_SUCCESS = 0,  /* action succeeded*/
+  IMAP_SUCCESS = 0,    /* action succeeded*/
   IMAP_NOMEM,          /* no memory */
   IMAP_CONNECT_FAILED, /* transport level connect failed */
   IMAP_PROTOCOL_ERROR, /* usually unexpected server response */
-  IMAP_AUTH_FAILURE, /* authentication failure */
+  IMAP_AUTH_FAILURE,   /* authentication failure */
   IMAP_AUTH_CANCELLED, /* authentication cancelled, do not retry */
-  IMAP_AUTH_UNAVAIL, /* no supported authentication method available */
-  IMAP_UNSECURE,     /* secure connection was requested but could not
-                      * be established. */
+  IMAP_AUTH_UNAVAIL,   /* no supported authentication method available */
+  IMAP_UNSECURE,       /* secure connection was requested but could not
+                        * be established. */
   IMAP_SELECT_FAILED /* SELECT command failed */
 } ImapResult;
 
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index 4680928..8635538 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -87,7 +87,7 @@ balsa_druid_page_user_init(BalsaDruidPageUser * user,
 #endif
     label = GTK_LABEL(gtk_label_new(_(header2)));
     gtk_label_set_line_wrap(label, TRUE);
-    gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(label), TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(label), FALSE, TRUE, 0);
 
     table = GTK_TABLE(gtk_table_new(10, 2, FALSE));
 
@@ -151,8 +151,7 @@ balsa_druid_page_user_init(BalsaDruidPageUser * user,
                                &(user->localmaildir));
     g_free(preset);
 #endif
-    gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(table), TRUE, TRUE,
-                       8);
+    gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(table), FALSE, FALSE, 8);
 
     user->need_set = FALSE;
 }
diff --git a/src/balsa-index.c b/src/balsa-index.c
index efb8ef1..98c3898 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -1035,7 +1035,7 @@ balsa_index_load_mailbox_node (BalsaIndex * index,
     } while(try_cnt++<3);
 
     if (!successp)
-	return TRUE;
+	return FALSE;
 
     /*
      * set the new mailbox