[balsa] Release balsa-2.4.9

[Pawel Salek <pawels src gnome org>]

commit 116becb10ddf4fb6420a9943018021ba90dab0ac
Author: Pawel Salek <pawsa0 gmail com>
Date:   Fri Nov 19 00:25:25 2010 +0100

    Release balsa-2.4.9
    
    * src/main-window.c:
    * libbalsa/information.c: compile against libnotify-0.7.0
    * configure.in, NEWS: release 2.4.9

 ChangeLog              |    6 ++++++
 NEWS                   |    4 ++++
 bootstrap.sh           |    2 ++
 configure.in           |   16 +++++++++++-----
 libbalsa/information.c |    9 +++++++--
 src/main-window.c      |    5 +++++
 6 files changed, 35 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2d8392b..1109a7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-19  Pawel Salek
+
+	* src/main-window.c:
+	* libbalsa/information.c: compile against libnotify-0.7.0
+	* configure.in, NEWS: release 2.4.9
+
 2010-11-16  Peter Bloomfield
 
 	* libbalsa/mailbox_imap.c (multi_append_cb): cast quotient, not
diff --git a/NEWS b/NEWS
index 2f723a4..ca492a1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+* Balsa-2.4.9 release. Release date 2010-11-19
+
+- compile against new GTK, libnotify libs.
+
 * Balsa-2.4.8 release. Release date 2010-08-21
 
 - QUOTA and MYRIGHTS IMAP extension support.
diff --git a/bootstrap.sh b/bootstrap.sh
index 7126271..3aa99dd 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -24,3 +24,5 @@ echo "Running automake..."
 automake --gnu --add-missing --copy || exit 1
 echo "Running configure $* ..."
 ./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 b72b6cd..b85695e 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ dnl ###########################################################################
 
 BALSA_MAJOR=2
 BALSA_REVISION=4
-BALSA_PATCHLEVEL=8
+BALSA_PATCHLEVEL=9
 BALSA_VERSION="$BALSA_MAJOR.$BALSA_REVISION.${BALSA_PATCHLEVEL}"
 
 AC_SUBST(BALSA_MAJOR)
@@ -245,6 +245,8 @@ AM_CONDITIONAL([BUILD_WITH_G_D_U], [test $with_g_d_u = "yes"])
 
 if test $with_g_d_u = yes ; then
 GNOME_DOC_INIT
+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[true])
+AM_CONDITIONAL([ENABLE_SK],[true])
 else
 AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[false])
 AM_CONDITIONAL([ENABLE_SK],[false])
@@ -709,10 +711,14 @@ fi
 
 # Libnotify configuration
 if test x$with_libnotify != xno; then
-    PKG_CHECK_MODULES(NOTIFY, [ libnotify ])
-    AC_DEFINE(HAVE_NOTIFY,1,[Defined when libnotify can be used.])
-    BALSA_LIBS="$BALSA_LIBS -lnotify"
-    BALSA_AB_LIBS="$BALSA_AB_LIBS -lnotify"
+    PKG_CHECK_MODULES(NOTIFY, [ libnotify >= 0.7.0 ], [notifyver=7],
+      PKG_CHECK_MODULES(NOTIFY, [ libnotify >= 0.5.0 ], [notifyver=5],
+        [AC_MSG_ERROR([*** You enabled notify but the library is not found.])]))
+    AC_DEFINE_UNQUOTED(HAVE_NOTIFY,$notifyver,
+                       [Defined when libnotify can be used.])
+    BALSA_LIBS="$BALSA_LIBS $NOTIFY_LIBS"
+    BALSA_AB_LIBS="$BALSA_AB_LIBS $NOTIFY_LIBS"
+    with_libnotify=0.$notifyver
 fi
 
 # NetworkManager
diff --git a/libbalsa/information.c b/libbalsa/information.c
index 7f3c8fe..12bd21b 100644
--- a/libbalsa/information.c
+++ b/libbalsa/information.c
@@ -121,8 +121,13 @@ libbalsa_information_varg(GtkWindow *parent, LibBalsaInformationType type,
         g_string_append(escaped, p);
         g_free(msg);
 
-        note =
-            notify_notification_new("Balsa", escaped->str, icon_str, NULL);
+#if HAVE_NOTIFY >= 7
+        note = notify_notification_new("Balsa", escaped->str, icon_str);
+#else
+        /* prior to 0.7.0 */
+        note = notify_notification_new("Balsa", escaped->str, icon_str, NULL);
+#endif
+
         g_string_free(escaped, TRUE);
 
         notify_notification_set_timeout(note, 7000);    /* 7 seconds */
diff --git a/src/main-window.c b/src/main-window.c
index f6a2a14..4406742 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -3405,8 +3405,13 @@ bw_display_new_mail_notification(int num_new, int has_new)
             num_total += num_new;
         } else {
             num_total = num_new;
+#if HAVE_NOTIFY >=7
+            balsa_app.main_window->new_mail_note =
+                notify_notification_new("Balsa", NULL, NULL);
+#else
             balsa_app.main_window->new_mail_note =
                 notify_notification_new("Balsa", NULL, NULL, NULL);
+#endif
             g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
                                                new_mail_note),
                                       (gpointer) & balsa_app.main_window->