[gnome-power-manager] Require libnotify as a hard build time dep

[Richard Hughes <rhughes src gnome org>]

commit 6c9cc7f0f2195103df3fddf7125393d00058e47c
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Oct 18 15:42:41 2010 +0100

    Require libnotify as a hard build time dep
    
    Signed-off-by: Richard Hughes <richard hughsie com>

 configure.ac      |    6 +-----
 src/gpm-common.h  |   19 -------------------
 src/gpm-manager.c |    2 --
 3 files changed, 1 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 58a8cf7..0df99e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,11 +130,7 @@ PKG_CHECK_EXISTS(
 PKG_CHECK_MODULES(UPOWER, upower-glib >= 0.9.1)
 
 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_NOTIFY,1,[Use session notifications])
-fi
+PKG_CHECK_MODULES(NOTIFY, libnotify >= 0.5.0)
 
 dnl Required for the properties window
 PKG_CHECK_MODULES(CONTROL_CENTER, [
diff --git a/src/gpm-common.h b/src/gpm-common.h
index 5797b18..e03a084 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -139,25 +139,6 @@ G_BEGIN_DECLS
 #define GS_CONF_DIR					"/apps/gnome-screensaver"
 #define GS_CONF_PREF_LOCK_ENABLED			GS_CONF_DIR "/lock_enabled"
 
-/* libnotify dummy code */
-#ifndef HAVE_NOTIFY
-#define	notify_init(f1)						/* nothing */
-#define	notify_is_initted(f1)					FALSE
-#define	notify_notification_close(f1,f2)			TRUE
-#define	notify_notification_show(f1,f2)				TRUE
-#define	notify_notification_set_timeout(f1,f2)			/* nothing */
-#define	notify_notification_set_urgency(f1,f2)			/* nothing */
-#define	notify_notification_add_action(f1,f2,f3,f4,f5,f6)	/* nothing */
-#define NotifyNotification					GtkWidget
-#define	NotifyUrgency						guint
-#define	notify_notification_new(f1,f2,f3,f4)			gtk_fixed_new()
-#define	notify_notification_new_with_status_icon(f1,f2,f3,f4)	gtk_fixed_new()
-#define NOTIFY_URGENCY_LOW					0
-#define NOTIFY_URGENCY_NORMAL					1
-#define NOTIFY_URGENCY_CRITICAL					2
-#define NOTIFY_EXPIRES_NEVER					0
-#endif
-
 typedef enum {
 	GPM_ICON_POLICY_PRESENT,
 	GPM_ICON_POLICY_CHARGE,
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 87a1bfe..155af42 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -40,9 +40,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <canberra-gtk.h>
 #include <libupower-glib/upower.h>
-#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
-#endif
 
 #include "egg-debug.h"
 #include "egg-console-kit.h"