X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnotify_desktop.c;h=c2d97520ed99c9bcbb8839900ea1858ba39731bf;hb=0003c4d3c184f0f437499d6073cd023dc7b659c2;hp=2e62e88c46fa61c3ea3b5200524d88fdb12ac779;hpb=92445ff3363441d0f515de4a3ab92a504cfc0366;p=collectd.git

diff --git a/src/notify_desktop.c b/src/notify_desktop.c
index 2e62e88c..c2d97520 100644
--- a/src/notify_desktop.c
+++ b/src/notify_desktop.c
@@ -1,21 +1,26 @@
 /**
  * collectd - src/notify_desktop.c
- * Copyright (C) 2008  Sebastian Harl
+ * Copyright (C) 2008       Sebastian Harl
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
- * Author:
+ * Authors:
  *   Sebastian Harl <sh at tokkee.org>
  **/
 
@@ -31,6 +36,10 @@
 #include <glib.h>
 #include <libnotify/notify.h>
 
+#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__)
@@ -72,7 +81,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;
@@ -94,7 +104,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;
@@ -145,7 +160,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 */