[Xfce4-commits] <xfce4-power-manager:master> Again; fix compatibility with libnotify 0.7.0

[Ali Abdallah]

Updating branch refs/heads/master
         to bea7b9666fbb27b8f1d0cd09cf624c7165311309 (commit)
       from 744638e7b79b683db1a1f9f797bf84ecc138af82 (commit)

commit bea7b9666fbb27b8f1d0cd09cf624c7165311309
Author: Ali Abdallah <aliov at xfce.org>
Date:   Wed Feb 16 07:53:27 2011 +0100

    Again; fix compatibility with libnotify 0.7.0

 src/xfpm-notify.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/xfpm-notify.c b/src/xfpm-notify.c
index b9e96d4..c93a843 100644
--- a/src/xfpm-notify.c
+++ b/src/xfpm-notify.c
@@ -215,19 +215,28 @@ xfpm_notify_new_notification_internal (const gchar *title, const gchar *message,
 {
     NotifyNotification *n;
     
-    n = notify_notification_new (title, message, NULL
+#ifdef NOTIFY_CHECK_VERSION
 #if NOTIFY_CHECK_VERSION (0, 7, 0) 
-    );
+    n = notify_notification_new (title, message, NULL);
 #else
-    , NULL);
+    n = notify_notification_new (title, message, NULL, NULL);
 #endif
+#else
+    n = notify_notification_new (title, message, NULL, NULL);
+#endif
+
     
     if ( icon_name )
     	xfpm_notify_set_notification_icon (n, icon_name);
 
-#if NOTIFY_CHECK_VERSION (0, 7, 0) 
+#ifdef NOTIFY_CHECK_VERSION
+#if !NOTIFY_CHECK_VERSION (0, 7, 0) 
     if ( icon )
     	notify_notification_attach_to_status_icon (n, icon);
+#else
+    if ( icon )
+    	notify_notification_attach_to_status_icon (n, icon);
+#endif
 #endif
 	
     notify_notification_set_urgency (n, (NotifyUrgency)urgency);