[patch] This works with all of 0.4.x 0.5.x and 0.7.x

syncevolution-1.1.1-libnotify-all-versions.patch (text/plain), 1.12 KB, created by Samuli Suominen (RETIRED) on 2011-02-08 15:23:53 UTC

diff -ur syncevolution-1.1.1.orig/src/syncevo-dbus-server.cpp syncevolution-1.1.1/src/syncevo-dbus-server.cpp
--- syncevolution-1.1.1.orig/src/syncevo-dbus-server.cpp	2010-12-26 15:40:50.000000000 +0200
+++ syncevolution-1.1.1/src/syncevo-dbus-server.cpp	2011-02-08 17:23:07.000000000 +0200
@@ -64,6 +64,9 @@
 
 #ifdef HAS_NOTIFY
 #include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
 #endif
 
 class DBusMessage;
@@ -6108,10 +6111,11 @@
         notify_notification_clear_actions(m_notification);
         notify_notification_close(m_notification, NULL);
     }
-#if !defined(NOTIFY_CHECK_VERSION)
-    m_notification = notify_notification_new(summary, body, NULL, NULL);
-#else // NOTIFY_CHECK_VERSION(0,7,0) is redundant, because 0.7.0 introduced NOTIFY_CHECK_VERSION
-    m_notification = notify_notification_new(summary, body, NULL);
+    m_notification = notify_notification_new(summary, body, NULL
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+    );
+#else
+    , NULL);
 #endif
     //if actions are not supported, don't add actions
     //An example is Ubuntu Notify OSD. It uses an alert box