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

[Richard Hughes <rhughes src gnome org>]

commit 9b2e23b2084ea3b1cd80970f3bb090c76b822fd0
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jun 29 15:53:23 2010 +0100

    trivial: libnotify >= 0.5.0 has dropped the GTK dep

 configure.ac                     |    8 ++++----
 contrib/gnome-packagekit.spec.in |    2 +-
 src/Makefile.am                  |    4 ++--
 src/gpk-check-update.c           |    6 +++---
 src/gpk-common.h                 |    2 +-
 src/gpk-dbus-service.c           |    2 +-
 src/gpk-dbus-task.c              |    4 ++--
 src/gpk-firmware.c               |    6 +++---
 src/gpk-hardware.c               |    4 ++--
 src/gpk-update-icon.c            |    2 +-
 src/gpk-watch.c                  |    4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f1c0cb5..9b1e3d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,11 +128,11 @@ PKG_CHECK_MODULES(CONTROL_CENTER, [
 PANELS_DIR="${libdir}/control-center-1/panels"
 AC_SUBST(PANELS_DIR)
 
-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 ---------------------------------------------------------------------------
diff --git a/contrib/gnome-packagekit.spec.in b/contrib/gnome-packagekit.spec.in
index c84adc8..e332a58 100644
--- a/contrib/gnome-packagekit.spec.in
+++ b/contrib/gnome-packagekit.spec.in
@@ -32,7 +32,7 @@ BuildRequires: gtk2-devel >= 2.18.1
 BuildRequires: libwnck-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
-#BuildRequires: libnotify-devel
+BuildRequires: libnotify-devel >= 0.5.0
 BuildRequires: gnome-panel-devel
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
diff --git a/src/Makefile.am b/src/Makefile.am
index a3cc27b..93c4d2f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES =						\
 	$(GIO_CFLAGS)					\
 	$(GTK_CFLAGS)					\
 	$(DBUS_CFLAGS)					\
-	$(LIBNOTIFY_CFLAGS)				\
+	$(NOTIFY_CFLAGS)				\
 	$(PACKAGEKIT_CFLAGS)				\
 	$(GUDEV_CFLAGS)					\
 	$(GNOME_MENUS_CFLAGS)				\
@@ -99,7 +99,7 @@ shared_LIBS =						\
 	$(DBUS_LIBS)					\
 	$(GTK_LIBS)					\
 	$(GUDEV_LIBS)					\
-	$(LIBNOTIFY_LIBS)				\
+	$(NOTIFY_LIBS)				\
 	$(PACKAGEKIT_LIBS)				\
 	$(GNOME_MENUS_LIBS)				\
 	$(UPOWER_LIBS)					\
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index 93185ec..15fb1ed 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 
 #include <gtk/gtk.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif
 #include <packagekit-glib2/packagekit.h>
@@ -56,7 +56,7 @@
 
 static void     gpk_check_update_finalize	(GObject	     *object);
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 static void	gpk_check_update_libnotify_cb (NotifyNotification *notification, gchar *action, gpointer data);
 #endif
 
@@ -559,7 +559,7 @@ gpk_check_update_activate_update_cb (GtkStatusIcon *status_icon, GpkCheckUpdate
 	}
 }
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 /**
  * gpk_check_update_libnotify_cb:
  **/
diff --git a/src/gpk-common.h b/src/gpk-common.h
index da363f1..b79dd93 100644
--- a/src/gpk-common.h
+++ b/src/gpk-common.h
@@ -94,7 +94,7 @@ G_BEGIN_DECLS
 #define GPK_UI_STATUS_SHOW_DELAY		250 /* ms */
 
 /* 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/gpk-dbus-service.c b/src/gpk-dbus-service.c
index 129327f..f13a273 100644
--- a/src/gpk-dbus-service.c
+++ b/src/gpk-dbus-service.c
@@ -25,7 +25,7 @@
 #include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
 #include <locale.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif
 #include <packagekit-glib2/packagekit.h>
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index 3c73705..ab01a26 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -30,7 +30,7 @@
 
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif
 #include <packagekit-glib2/packagekit.h>
@@ -261,7 +261,7 @@ out:
 	return;
 }
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 /**
  * gpk_dbus_task_libnotify_cb:
  **/
diff --git a/src/gpk-firmware.c b/src/gpk-firmware.c
index 6f58a37..d6ba537 100644
--- a/src/gpk-firmware.c
+++ b/src/gpk-firmware.c
@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif
 #include <packagekit-glib2/packagekit.h>
@@ -90,7 +90,7 @@ typedef struct {
 
 G_DEFINE_TYPE (GpkFirmware, gpk_firmware, G_TYPE_OBJECT)
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 static void gpk_firmware_install_file (GpkFirmware *firmware);
 static void gpk_firmware_ignore_devices (GpkFirmware *firmware);
 
@@ -177,7 +177,7 @@ gpk_firmware_request_free (GpkFirmwareRequest *req)
 }
 
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 /**
  * gpk_firmware_rebind:
  **/
diff --git a/src/gpk-hardware.c b/src/gpk-hardware.c
index 2d29fce..6fe7932 100644
--- a/src/gpk-hardware.c
+++ b/src/gpk-hardware.c
@@ -34,7 +34,7 @@
 #endif /* HAVE_UNISTD_H */
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif
 #include <dbus/dbus-glib.h>
@@ -69,7 +69,7 @@ struct GpkHardwarePrivate
 
 G_DEFINE_TYPE (GpkHardware, gpk_hardware, G_TYPE_OBJECT)
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 /**
  * gpk_hardware_install_packages_cb:
  **/
diff --git a/src/gpk-update-icon.c b/src/gpk-update-icon.c
index 1efa287..8437f2a 100644
--- a/src/gpk-update-icon.c
+++ b/src/gpk-update-icon.c
@@ -30,7 +30,7 @@
 #include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
 #include <locale.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif
 #include <packagekit-glib2/packagekit.h>
diff --git a/src/gpk-watch.c b/src/gpk-watch.c
index 2a514a5..ed14b90 100644
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 
 #include <gtk/gtk.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif
 #include <packagekit-glib2/packagekit.h>
@@ -380,7 +380,7 @@ out:
 	return TRUE;
 }
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 /**
  * gpk_watch_libnotify_cb:
  **/