Fix compile against libnotify-0.7

[dhcpcd-ui] / src / dhcpcd-gtk / main.c

diff --git a/src/dhcpcd-gtk/main.c b/src/dhcpcd-gtk/main.c
index 222ef5c450a43088b59a99e63bc2ddc1320189da..295bfb1a87dd70c08ffb9f080666c7ba8ad6b249 100644 (file)
--- a/src/dhcpcd-gtk/main.c
+++ b/src/dhcpcd-gtk/main.c
@@ -1,6 +1,6 @@
 /*
  * dhcpcd-gtk
- * Copyright 2009-2010 Roy Marples <roy@marples.name>
+ * Copyright 2009-2011 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,9 @@
 
 #ifdef NOTIFY
 #  include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#  define NOTIFY_CHECK_VERSION(a,b,c) 0
+#endif
 static NotifyNotification *nn;
 #endif
 
@@ -202,6 +205,10 @@ notify(const char *title, const char *msg, const char *icon)
        for (m = msgs; *m; m++)
                g_message("%s", *m);
        g_strfreev(msgs);
+
+#if NOTIFY_CHECK_VERSION(0,7,0)
+       nn = nn = notify_notification_new(title, msg, icon);
+#else
        if (nn != NULL)
                notify_notification_close(nn, NULL);
        if (gtk_status_icon_get_visible(status_icon))
@@ -209,6 +216,8 @@ notify(const char *title, const char *msg, const char *icon)
                    msg, icon, status_icon);
        else
                nn = notify_notification_new(title, msg, icon, NULL);
+#endif
+
        notify_notification_set_timeout(nn, 5000);
        g_signal_connect(nn, "closed", G_CALLBACK(notify_closed), NULL);
        notify_notification_show(nn, NULL);