X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnotify_desktop.c;h=3f3c6dfc9bf62c3ac0dc356295f0e68faf5879a8;hb=3faf514fd9b869cadda0f895e14e5036313c7781;hp=822b50663a3b6060a7f3b1c902f709f360570f14;hpb=105436ca4a5de47c87f7bb7e31896878dc4ae97b;p=collectd.git diff --git a/src/notify_desktop.c b/src/notify_desktop.c index 822b5066..3f3c6dfc 100644 --- a/src/notify_desktop.c +++ b/src/notify_desktop.c @@ -24,12 +24,17 @@ */ #include "collectd.h" +#include "common.h" #include "plugin.h" #include "configfile.h" #include #include +#ifndef NOTIFY_CHECK_VERSION +# define NOTIFY_CHECK_VERSION(x,y,z) 0 +#endif + #define log_info(...) INFO ("notify_desktop: " __VA_ARGS__) #define log_warn(...) WARNING ("notify_desktop: " __VA_ARGS__) #define log_err(...) ERROR ("notify_desktop: " __VA_ARGS__) @@ -71,7 +76,8 @@ static int c_notify_config (oconfig_item_t *ci) return 0; } /* c_notify_config */ -static int c_notify (const notification_t *n) +static int c_notify (const notification_t *n, + user_data_t __attribute__((unused)) *user_data) { NotifyNotification *notification = NULL; NotifyUrgency urgency = NOTIFY_URGENCY_LOW; @@ -93,7 +99,12 @@ static int c_notify (const notification_t *n) : (NOTIF_WARNING == n->severity) ? "WARNING" : (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN"); - notification = notify_notification_new (summary, n->message, NULL, NULL); + notification = notify_notification_new (summary, n->message, NULL +#if NOTIFY_CHECK_VERSION (0, 7, 0) + ); +#else + , NULL); +#endif if (NULL == notification) { log_err ("Failed to create a new notification."); return -1; @@ -144,7 +155,8 @@ static int c_notify_init (void) free (spec_version); } - plugin_register_notification ("notify_desktop", c_notify); + plugin_register_notification ("notify_desktop", c_notify, + /* user_data = */ NULL); plugin_register_shutdown ("notify_desktop", c_notify_shutdown); return 0; } /* c_notify_init */