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



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

    trivial: libnotify >= 0.5.0 has dropped the GTK dep

 configure.ac                        |    8 ++++----
 contrib/gnome-color-manager.spec.in |    2 +-
 src/gcm-session.c                   |    4 ++--
 src/gcm-utils.h                     |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 250f074..73814cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,11 +122,11 @@ if test x$has_vte = xyes; then
 	AC_DEFINE(HAVE_VTE,1,[Use VTE terminal widget])
 fi
 
-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 **** Check for SANE ****
diff --git a/contrib/gnome-color-manager.spec.in b/contrib/gnome-color-manager.spec.in
index 4d37922..c37226e 100644
--- a/contrib/gnome-color-manager.spec.in
+++ b/contrib/gnome-color-manager.spec.in
@@ -39,7 +39,7 @@ BuildRequires: libtiff-devel
 BuildRequires: libexif-devel
 BuildRequires: exiv2-devel
 BuildRequires: libcanberra-devel
-BuildRequires: libnotify-devel
+BuildRequires: libnotify-devel >= 0.5.0
 BuildRequires: glib2-devel >= 2.25.8
 
 %description
diff --git a/src/gcm-session.c b/src/gcm-session.c
index 38de287..6090b3c 100644
--- a/src/gcm-session.c
+++ b/src/gcm-session.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <locale.h>
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #endif
 #include "egg-debug.h"
@@ -68,7 +68,7 @@ gcm_session_check_idle_cb (gpointer user_data)
 	return TRUE;
 }
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 /**
  * gcm_session_notify_cb:
  **/
diff --git a/src/gcm-utils.h b/src/gcm-utils.h
index ec35b9f..bda16f7 100644
--- a/src/gcm-utils.h
+++ b/src/gcm-utils.h
@@ -63,7 +63,7 @@
 #define GCM_PREFS_PACKAGE_NAME_COLOR_PROFILES_EXTRA	"shared-color-profiles-extra"
 
 /* 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



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]