Updating branch refs/heads/master
to 4dd3a0c7f28c56997410f9da3fa9dba3ae0dc750 (commit)
from c76a8a531c8be646ac15a33fc8168e4387250d0d (commit)
commit 4dd3a0c7f28c56997410f9da3fa9dba3ae0dc750
Author: Steve Dodier <[email protected]>
Date: Thu Mar 3 11:36:03 2011 +0100
Allow compatibility with Libnotify 0.7 (thanks to Samuli Suominen for the
patch)
ChangeLog | 3 +++
src/xvd_notify.c | 14 +++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 551defa..e1690ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
2011-03-03 Steve Dodier <[email protected]>
+ * Allow compatibility with Libnotify 0.7 (thanks to Samuli Suominen for
the patch)
+
+2011-03-03 Steve Dodier <[email protected]>
* Partially applying a patch from Yves-Alexis Perez to allow custom
CFLAGS when building in release mode
2011-03-02 Steve Dodier <[email protected]>
diff --git a/src/xvd_notify.c b/src/xvd_notify.c
index 47a88be..bf9e377 100644
--- a/src/xvd_notify.c
+++ b/src/xvd_notify.c
@@ -117,11 +117,15 @@ xvd_notify_init(XvdInstance *Inst,
g_list_free (caps_list);
}
- Inst->notification = notify_notification_new (
- "Xfce4-Volumed",
- NULL,
- NULL,
- NULL);
+#ifdef NOTIFY_CHECK_VERSION
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL,
NULL);
+#else
+ Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL,
NULL, NULL);
+#endif
+#else
+ Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL,
NULL, NULL);
+#endif
}
void
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
