[gnome-power-manager] trivial: libnotify >= 0.5.0 has dropped the GTK dep

[Richard Hughes <rhughes src gnome org>]

commit d2fbc536c1f5301e792d34757d486fe707e81b5d
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jun 29 15:53:07 2010 +0100

    trivial: libnotify >= 0.5.0 has dropped the GTK dep

 applets/brightness/Makefile.am |    2 +-
 applets/inhibit/Makefile.am    |    2 +-
 configure.ac                   |    8 ++++----
 src/Makefile.am                |    6 +++---
 src/gpm-common.h               |    2 +-
 src/gpm-manager.c              |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am
index 060f29c..5469f88 100644
--- a/applets/brightness/Makefile.am
+++ b/applets/brightness/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =							\
 	$(DBUS_CFLAGS)						\
 	$(GNOME_CFLAGS)						\
 	$(PANEL_CFLAGS)						\
-	$(LIBNOTIFY_CFLAGS)					\
+	$(NOTIFY_CFLAGS)					\
 	$(GTKUNIQUE_CFLAGS)					\
 	-DBINDIR=\"$(bindir)\"			 		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	 	\
diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am
index 849f1c6..4e48fe0 100644
--- a/applets/inhibit/Makefile.am
+++ b/applets/inhibit/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =							\
 	$(DBUS_CFLAGS)						\
 	$(GNOME_CFLAGS)						\
 	$(PANEL_CFLAGS)						\
-	$(LIBNOTIFY_CFLAGS)					\
+	$(NOTIFY_CFLAGS)					\
 	$(GTKUNIQUE_CFLAGS)					\
 	-DBINDIR=\"$(bindir)\"			 		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		\
diff --git a/configure.ac b/configure.ac
index b964a85..863614e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,11 +139,11 @@ PKG_CHECK_EXISTS(
 
 PKG_CHECK_MODULES(UPOWER, upower-glib >= 0.9.1)
 
-dnl **** Check for LIBNOTIFY ****
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify3 >= 0.4.3, has_libnotify=yes, has_libnotify=no)
-AM_CONDITIONAL(HAVE_LIBNOTIFY, test x$libnotify = xyes)
+dnl **** Check for NOTIFY ****
+PKG_CHECK_MODULES(NOTIFY, libnotify >= 0.5.0, has_libnotify=yes, has_libnotify=no)
+AM_CONDITIONAL(HAVE_NOTIFY, test x$libnotify = xyes)
 if test x$has_libnotify = xyes; then
-	AC_DEFINE(HAVE_LIBNOTIFY,1,[Use session notifications])
+	AC_DEFINE(HAVE_NOTIFY,1,[Use session notifications])
 fi
 
 dnl Required for the properties window
diff --git a/src/Makefile.am b/src/Makefile.am
index 7549091..5f5ca1e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES =						\
 	$(DBUS_CFLAGS)					\
 	$(GNOME_CFLAGS)					\
 	$(X11_CFLAGS)					\
-	$(LIBNOTIFY_CFLAGS)				\
+	$(NOTIFY_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
 	$(GSTREAMER_CFLAGS)				\
 	$(CONTROL_CENTER_CFLAGS)			\
@@ -179,7 +179,7 @@ gnome_power_manager_LDADD =				\
 	$(DBUS_LIBS)					\
 	$(X11_LIBS)						\
 	$(CANBERRA_LIBS)				\
-	$(LIBNOTIFY_LIBS)				\
+	$(NOTIFY_LIBS)				\
 	$(GPM_EXTRA_LIBS)				\
 	$(UPOWER_LIBS)					\
 	-lm
@@ -219,7 +219,7 @@ gnome_power_self_test_LDADD =				\
 	$(UPOWER_LIBS)					\
 	$(DBUS_LIBS)					\
 	$(X11_LIBS)					\
-	$(LIBNOTIFY_LIBS)				\
+	$(NOTIFY_LIBS)				\
 	$(GPM_EXTRA_LIBS)				\
 	-lm
 
diff --git a/src/gpm-common.h b/src/gpm-common.h
index ebf7150..fafc532 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -139,7 +139,7 @@ G_BEGIN_DECLS
 #define GS_CONF_PREF_LOCK_ENABLED			GS_CONF_DIR "/lock_enabled"
 
 /* libnotify dummy code */
-#ifndef HAVE_LIBNOTIFY
+#ifndef HAVE_NOTIFY
 #define	notify_init(f1)						/* nothing */
 #define	notify_is_initted(f1)					FALSE
 #define	notify_notification_close(f1,f2)			TRUE
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 6781ec4..ecdbbd4 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -40,7 +40,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <canberra-gtk.h>
 #include <libupower-glib/upower.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif