From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 7 Nov 2011 18:49:11 +0000 (+0000)
Subject: improve code (libnotify version checking)
X-Git-Tag: v0.8.0.5~606
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=0dc49160336a74ee63f47cdde796443c9d869931

improve code (libnotify version checking)
---

diff --git a/src/ui_notify.c b/src/ui_notify.c
index 57eb63a..693473b 100644
--- a/src/ui_notify.c
+++ b/src/ui_notify.c
@@ -22,6 +22,11 @@
 
 #include <libnotify/notify.h>
 
+/* Macro defined since libnotify 0.5.2 */
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 #include "ui.h"
 #include "ui_notify.h"
 
@@ -63,10 +68,7 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
 		/*
 		 * Since libnotify 0.7 notify_notification_new has
 		 * only 3 parameters.
-		 *
-		 * NOTIFY_CHECK_VERSION exists since 0.5.2.
 		 */		
-#ifdef NOTIFY_CHECK_VERSION
 #if NOTIFY_CHECK_VERSION(0, 7, 0)
 		notif = notify_notification_new(_("Temperature alert"),
 						name,
@@ -77,12 +79,6 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
 						NULL,
 						GTK_WIDGET(ui->main_window));
 #endif
-#else		
-		notif = notify_notification_new(_("Temperature alert"),
-						name,
-						NULL,
-						GTK_WIDGET(ui->main_window));
-#endif
 
 		notify_notification_show(notif, NULL);