[balsa] Build on Lucid β

[Peter Bloomfield <PeterB src gnome org>]

commit abea1645eb9a9dbabc80d8f1d1e51b9fee6ff88e
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Apr 11 09:59:57 2010 -0400

    Build on Lucid β
    
    	* libbalsa/filter.c (libbalsa_filter_mailbox_messages): build on
    	Lucid β.
    	* src/ab-main.c: ditto.
    	* src/main.c (balsa_cleanup): ditto.

 ChangeLog         |    7 +++++++
 libbalsa/filter.c |    2 +-
 src/ab-main.c     |    2 +-
 src/main.c        |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 39f57e2..c72f332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-11  Albrecht DreÃ?
+
+	* libbalsa/filter.c (libbalsa_filter_mailbox_messages): build on
+	Lucid β.
+	* src/ab-main.c: ditto.
+	* src/main.c (balsa_cleanup): ditto.
+
 2010-04-07  Peter Bloomfield
 
 	* src/balsa-index.c (bndx_string_width): use allocation width
diff --git a/libbalsa/filter.c b/libbalsa/filter.c
index 450fab6..2190e5f 100644
--- a/libbalsa/filter.c
+++ b/libbalsa/filter.c
@@ -265,7 +265,7 @@ libbalsa_filter_mailbox_messages(LibBalsaFilter * filt,
                                   NULL);
         g_message("(%s) play %s, %s", __func__, filt->sound, ca_strerror(rc));
     }
-#elif HAVE_GNOME
+#elif (defined(HAVE_GNOME) && !defined(GNOME_DISABLE_DEPRECATED))
     if (filt->sound)
 	gnome_sound_play(filt->sound);
 #endif                          /* HAVE_CANBERRA */
diff --git a/src/ab-main.c b/src/ab-main.c
index 7887f0f..ad372e3 100644
--- a/src/ab-main.c
+++ b/src/ab-main.c
@@ -1201,7 +1201,7 @@ main(int argc, char *argv[])
 static void
 bab_cleanup(void)
 {
-#if HAVE_GNOME
+#if (defined(HAVE_GNOME) && !defined(GNOME_DISABLE_DEPRECATED))
     gnome_sound_shutdown();
 #endif
     gtk_main_quit();
diff --git a/src/main.c b/src/main.c
index 4803629..8a1317f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1211,7 +1211,7 @@ balsa_cleanup(void)
     g_hash_table_destroy(libbalsa_mailbox_view_table);
     libbalsa_mailbox_view_table = NULL;
 
-#if HAVE_GNOME
+#if (defined(HAVE_GNOME) && !defined(GNOME_DISABLE_DEPRECATED))
     gnome_sound_shutdown();
 #endif
 }