From 7d7b78e14f8b15568fb0b011f9eb9bc019069e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Wed, 3 Aug 2011 11:39:57 +0100
Subject: Do not support the gnome-power-manager dbus interface anymore

The interface was removed upstream and moved to gnome-settings-daemon
---
 Makefile.am           | 1 -
 configure.ac          | 4 +---
 src/indicator-power.c | 7 -------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 87cf404..932775f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,6 @@ libpower_la_SOURCES = \
 libpower_la_CFLAGS = \
         $(UPOWER_CFLAGS) \
         $(INDICATOR_CFLAGS) \
-        -DHAVE_GSD \
         -Wall -Werror \
         -DG_LOG_DOMAIN=\"Indicator-Power\"
 libpower_la_LIBADD = \
diff --git a/configure.ac b/configure.ac
index ebb25d0..3aa8491 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,9 +39,7 @@ PKG_CHECK_MODULES([INDICATOR],[
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
         indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 ])
-PKG_CHECK_MODULES([GSD],[gnome-settings-daemon >= $GSD_REQUIRED_VERSION],
-                  [have_gsd=yes],[have_gsd=no])
-AM_CONDITIONAL([HAVE_GSD],[test x$have_gsd = xyes])
+PKG_CHECK_MODULES([GSD],[gnome-settings-daemon >= $GSD_REQUIRED_VERSION])
 
 ###########################
 # Check to see if we're local
diff --git a/src/indicator-power.c b/src/indicator-power.c
index 5649473..17c6bd5 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -38,17 +38,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DEFAULT_ICON   "gpm-battery-missing"
 
-#if HAVE_GSD
 #define DBUS_SERVICE                "org.gnome.SettingsDaemon"
 #define DBUS_PATH                   "/org/gnome/SettingsDaemon"
 #define POWER_DBUS_PATH             DBUS_PATH "/Power"
 #define POWER_DBUS_INTERFACE        "org.gnome.SettingsDaemon.Power"
-#else
-#define DBUS_SERVICE                "org.gnome.PowerManager"
-#define DBUS_PATH                   "/org/gnome/PowerManager"
-#define POWER_DBUS_PATH             DBUS_PATH
-#define POWER_DBUS_INTERFACE        "org.gnome.PowerManager"
-#endif
 
 #define INDICATOR_POWER_TYPE            (indicator_power_get_type ())
 #define INDICATOR_POWER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_POWER_TYPE, IndicatorPower))
-- 
cgit v1.2.3