[Xfce4-commits] <xfce4-settings:master> Updates for release.

[Nick Schermer]

Updating branch refs/heads/master
         to daddc2a54b7dbbd7f1778dca2225ec7960e16fea (commit)
       from 1f0e6dedffa22bb53a3c9769a8621f1352a06861 (commit)

commit daddc2a54b7dbbd7f1778dca2225ec7960e16fea
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Dec 5 15:54:54 2010 +0100

    Updates for release.

 NEWS                                  |    4 ++++
 configure.ac.in                       |    4 ++--
 xfce4-settings-helper/accessibility.c |    6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 3a88d27..2149def 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+4.7.6
+=====
+- Add checks for API change in libnotify 0.7.0.
+
 4.7.5
 =====
 - Use xfconf_channel_get instead of xfconf_channel_new.
diff --git a/configure.ac.in b/configure.ac.in
index 2516256..8ea34cd 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,10 +11,10 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
 m4_define([xfce4_settings_version_minor], [7])
-m4_define([xfce4_settings_version_micro], [5])
+m4_define([xfce4_settings_version_micro], [6])
 m4_define([xfce4_settings_version_nano], [])
 m4_define([xfce4_settings_version_build], [@REVISION@])
-m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
+m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
 m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
 
 dnl *******************************************
diff --git a/xfce4-settings-helper/accessibility.c b/xfce4-settings-helper/accessibility.c
index d2ed8f5..a559607 100644
--- a/xfce4-settings-helper/accessibility.c
+++ b/xfce4-settings-helper/accessibility.c
@@ -411,11 +411,15 @@ xfce_accessibility_helper_notification_show (XfceAccessibilityHelper *helper,
     if (helper->notification == NULL)
     {
         /* create a new notification */
-#if defined(NOTIFY_CHECK_VERSION) && NOTIFY_CHECK_VERSION (0, 7, 0)
+#ifdef NOTIFY_CHECK_VERSION
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
         helper->notification = notify_notification_new (summary, body, "keyboard");
 #else
         helper->notification = notify_notification_new (summary, body, "keyboard", NULL);
 #endif
+#else
+        helper->notification = notify_notification_new (summary, body, "keyboard", NULL);
+#endif
 
         /* close signal */
         g_signal_connect (G_OBJECT (helper->notification), "closed", G_CALLBACK (xfce_accessibility_helper_notification_closed), helper);