diff options
| author | Javier Jardón <javier.jardon@codethink.co.uk> | 2011-08-03 11:39:57 +0100 |
|---|---|---|
| committer | Javier Jardón <javier.jardon@codethink.co.uk> | 2011-08-03 11:39:57 +0100 |
| commit | 7d7b78e14f8b15568fb0b011f9eb9bc019069e34 (patch) | |
| tree | 1a51a040bd3f632efd91b6e89186465fcdbe2624 | |
| parent | d58b6ad197b361287f6f30300039078c7e892026 (diff) | |
| download | ayatana-indicator-power-7d7b78e14f8b15568fb0b011f9eb9bc019069e34.tar.gz ayatana-indicator-power-7d7b78e14f8b15568fb0b011f9eb9bc019069e34.tar.bz2 ayatana-indicator-power-7d7b78e14f8b15568fb0b011f9eb9bc019069e34.zip | |
Do not support the gnome-power-manager dbus interface anymore
The interface was removed upstream and moved to gnome-settings-daemon
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/indicator-power.c | 7 |
3 files changed, 1 insertions, 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)) |