[gnome-settings-daemon] datetime: Remove datetime D-Bus mechanism
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] datetime: Remove datetime D-Bus mechanism
- Date: Thu, 19 Jan 2012 22:38:26 +0000 (UTC)
commit 27fa171efe4179c0a42ec79e0dc501077f042a08
Author: Bastien Nocera <hadess hadess net>
Date: Thu Jan 19 22:33:21 2012 +0000
datetime: Remove datetime D-Bus mechanism
Now that gnome-control-center uses systemd's date & time mechanism[1],
we don't need to ship our own mechanism for that purpose. This also
removes the last user of dbus-glib in gnome-settings-daemon [2].
[1]: https://bugzilla.gnome.org/show_bug.cgi?id=658352
[2]: https://bugzilla.gnome.org/show_bug.cgi?id=622878
configure.ac | 57 --
plugins/Makefile.am | 1 -
plugins/datetime/Makefile.am | 72 --
plugins/datetime/gsd-datetime-mechanism-debian.c | 200 -----
plugins/datetime/gsd-datetime-mechanism-debian.h | 27 -
plugins/datetime/gsd-datetime-mechanism-fedora.c | 209 -----
plugins/datetime/gsd-datetime-mechanism-fedora.h | 31 -
plugins/datetime/gsd-datetime-mechanism-main.c | 171 ----
plugins/datetime/gsd-datetime-mechanism-suse.c | 187 ----
plugins/datetime/gsd-datetime-mechanism-suse.h | 32 -
plugins/datetime/gsd-datetime-mechanism.c | 772 ----------------
plugins/datetime/gsd-datetime-mechanism.h | 112 ---
plugins/datetime/gsd-datetime-mechanism.xml | 129 ---
...org.gnome.SettingsDaemon.DateTimeMechanism.conf | 19 -
...ome.SettingsDaemon.DateTimeMechanism.service.in | 4 -
...nome.settingsdaemon.datetimemechanism.policy.in | 21 -
plugins/datetime/system-timezone.c | 924 --------------------
plugins/datetime/system-timezone.h | 80 --
plugins/datetime/test-system-timezone.c | 93 --
19 files changed, 0 insertions(+), 3141 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 13228ee..5dbbe63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,24 +120,6 @@ AC_SUBST(LIBNOTIFY_CFLAGS)
AC_SUBST(LIBNOTIFY_LIBS)
dnl ---------------------------------------------------------------------------
-dnl - Check for D-Bus
-dnl ---------------------------------------------------------------------------
-
-dnl - Are we specifying a different dbus root ?
-AC_ARG_WITH(dbus-sys,
- [AC_HELP_STRING([--with-dbus-sys=<dir>],
- [where D-BUS system.d directory is])])
-AC_ARG_WITH(dbus-services,
- [AC_HELP_STRING([--with-dbus-services=<dir>],
- [where D-BUS services directory is])])
-if ! test -z "$with_dbus_sys" ; then
- DBUS_SYS_DIR="$with_dbus_sys"
-else
- DBUS_SYS_DIR='${sysconfdir}/dbus-1/system.d'
-fi
-AC_SUBST(DBUS_SYS_DIR)
-
-dnl ---------------------------------------------------------------------------
dnl - GUdev integration (default enabled)
dnl ---------------------------------------------------------------------------
GUDEV_PKG=""
@@ -307,42 +289,6 @@ dnl ==============================================
PKG_CHECK_MODULES(UPOWER, upower-glib >= 0.9.1 libcanberra-gtk3)
# ---------------------------------------------------------------------------
-# PolicyKit for the date & time mechanism
-# ---------------------------------------------------------------------------
-
-POLKIT_REQUIRED=0.97
-DBUS_REQUIRED=1.1.2
-
-# PolicyKit detection; defaults to 'auto' (use it if it's available)
-#
-POLKIT_CFLAGS=
-POLKIT_LIBS=
-AC_ARG_ENABLE(polkit,
- AS_HELP_STRING([--enable-polkit],
- [Enable PolicyKit support (auto)]),
- enable_polkit=$enableval,
- enable_polkit=auto)
-
-if test "x$enable_polkit" = "xno" ; then
- HAVE_POLKIT=no
-else
- HAVE_POLKIT=no
- PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION, HAVE_POLKIT=yes, HAVE_POLKIT=no)
-
- if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno" ; then
- AC_MSG_ERROR(PolicyKit support explicity enabled but not available)
- fi
-
- if test "x$HAVE_POLKIT" = "xyes" ; then
- AC_DEFINE(HAVE_POLKIT, 1, [Defined if PolicyKit support is enabled])
- fi
-fi
-AM_CONDITIONAL(HAVE_POLKIT, test "x$HAVE_POLKIT" = "xyes")
-AC_SUBST(POLKIT_CFLAGS)
-AC_SUBST(POLKIT_LIBS)
-
-
-# ---------------------------------------------------------------------------
# CUPS
# ---------------------------------------------------------------------------
@@ -474,7 +420,6 @@ plugins/clipboard/Makefile
plugins/color/Makefile
plugins/common/Makefile
plugins/cursor/Makefile
-plugins/datetime/Makefile
plugins/dummy/Makefile
plugins/power/Makefile
plugins/housekeeping/Makefile
@@ -532,8 +477,6 @@ echo "
cflags: ${CFLAGS}
Maintainer mode: ${USE_MAINTAINER_MODE}
- dbus-1 system.d dir: ${DBUS_SYS_DIR}
- PolicyKit support: ${HAVE_POLKIT}
LCMS DICT support: ${have_new_lcms}
Libnotify support: ${have_libnotify}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 83d223a..2b7566a 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -8,7 +8,6 @@ enabled_plugins = \
clipboard \
color \
cursor \
- datetime \
dummy \
power \
housekeeping \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]