gnome-bluetooth r467 - in trunk: . applet

[hadess svn gnome org]

Author: hadess
Date: Mon Mar  9 14:01:03 2009
New Revision: 467
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=467&view=rev

Log:
Require GTK+ 2.15.x otherwise the applet won't compile


Modified:
   trunk/applet/notify.c
   trunk/configure.ac

Modified: trunk/applet/notify.c
==============================================================================
--- trunk/applet/notify.c	(original)
+++ trunk/applet/notify.c	Mon Mar  9 14:01:03 2009
@@ -96,9 +96,7 @@
 
 	statusicon = gtk_status_icon_new_from_icon_name(icon_name);
 
-#if GTK_CHECK_VERSION(2,15,0)
 	gtk_status_icon_set_tooltip_markup(statusicon, _("Bluetooth Manager"));
-#endif
 
 	return statusicon;
 }

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Mar  9 14:01:03 2009
@@ -63,6 +63,7 @@
 fi
 AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
 
+GTK_REQUIRED=2.15.0
 DBUS_GLIB_REQUIRED=0.73
 HAL_REQUIRED=0.5.8
 NOTIFY_REQUIRED=0.4.3
@@ -78,7 +79,7 @@
 PKG_CHECK_MODULES(APPLET,
 		  dbus-glib-1 >= $DBUS_GLIB_REQUIRED
 		  gconf-2.0
-		  gtk+-2.0
+		  gtk+-2.0 >= $GTK_REQUIRED
 		  libnotify >= $NOTIFY_REQUIRED
 		  unique-1.0)