Permalink
Browse files

power-icon: use systemd to power off, rather than Console Kit

  • Loading branch information...
thos committed Apr 13, 2012
1 parent e5a1755 commit db9fcf11e93cba29166a09c25f2d24b4b32fac13
View
@@ -5,8 +5,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-capplet
# always built
SUBDIRS = build libdawati-panel
-if USE_ECK_GPM_GVC
-SUBDIRS += egg-console-kit gpm gvc
+if USE_GPM_GVC
+SUBDIRS += gpm gvc
endif
if USE_PENGE_MAILME
View
@@ -451,11 +451,6 @@ AM_CONDITIONAL([USE_PENGE_MAILME],
[test "$dawati_use_myzone_panel" = "yes" || test "$dawati_use_datetime_panel" = "yes"])
if test x$dawati_use_devices_panel = xyes || test x$dawati_use_power_icon_panel = xyes; then
- #
- # Egg Console Kit
- #
- PKG_CHECK_MODULES(ECK, dbus-glib-1)
-
#
# Gnome Power Manager
#
@@ -471,7 +466,8 @@ if test x$dawati_use_devices_panel = xyes || test x$dawati_use_power_icon_panel
PKG_CHECK_MODULES(GVC, libpulse-mainloop-glib >= 0.9.15)
fi
-AM_CONDITIONAL([USE_ECK_GPM_GVC],
+
+AM_CONDITIONAL([USE_GPM_GVC],
[test "$dawati_use_devices_panel" = "yes" || test "$dawati_use_power_icon_panel" = "yes"])
if test x$dawati_use_people_panel = xyes || test x$dawati_use_status_panel = xyes; then
@@ -587,8 +583,6 @@ callouts/3g/Makefile
callouts/Makefile
callouts/openconnect/Makefile
-egg-console-kit/Makefile
-
gpm/Makefile
gvc/Makefile
@@ -1,18 +0,0 @@
-AM_CFLAGS = \
- $(ECK_CFLAGS) \
- -DEGG_CONSOLE="\"MPD_CONSOLE\"" \
- -DEGG_LOGGING="\"MPD_LOGGING\"" \
- -DEGG_LOG_FILE=\""/tmp/dawati-panel-devices.log"\" \
- -DEGG_VERBOSE="\"MPD_VERBOSE\"" \
- $(NULL)
-
-noinst_LTLIBRARIES = \
- libegg-console-kit.la \
- $(NULL)
-
-libegg_console_kit_la_SOURCES = \
- egg-console-kit.c \
- egg-console-kit.h \
- egg-debug.c \
- egg-debug.h \
- $(NULL)
Oops, something went wrong.

0 comments on commit db9fcf1

Please sign in to comment.