diff options
| author | Bastien Nocera <hadess@hadess.net> | 2012-01-19 22:33:21 (GMT) |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-01-19 22:36:24 (GMT) |
| commit | 27fa171efe4179c0a42ec79e0dc501077f042a08 (patch) | |
| tree | c005eb63d21ef9964f8c04dde902e8dd2ca52280 | |
| parent | 0912d3235db73a1e206dc2084fa3abccea6f8114 (diff) | |
| download | gnome-settings-daemon-27fa171efe4179c0a42ec79e0dc501077f042a08.zip gnome-settings-daemon-27fa171efe4179c0a42ec79e0dc501077f042a08.tar.xz | |
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
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 \ diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am deleted file mode 100644 index fdbf0e0..0000000 --- a/plugins/datetime/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -plugin_name = datetime - -dbus_servicesdir = $(datadir)/dbus-1/system-services -dbus_confdir = $(sysconfdir)/dbus-1/system.d -polkitdir = $(datadir)/polkit-1/actions - -dbus_services_in_files = org.gnome.SettingsDaemon.DateTimeMechanism.service.in -polkit_in_files = org.gnome.settingsdaemon.datetimemechanism.policy.in - -gsd-datetime-mechanism-glue.h: $(srcdir)/gsd-datetime-mechanism.xml - $(AM_V_GEN) dbus-binding-tool \ - --prefix=gsd_datetime_mechanism --mode=glib-server \ - --output=gsd-datetime-mechanism-glue.h \ - $(srcdir)/gsd-datetime-mechanism.xml - - -if HAVE_POLKIT -libexec_PROGRAMS = gsd-datetime-mechanism -noinst_PROGRAMS = test-system-timezone -endif - -gsd_datetime_mechanism_SOURCES = \ - gsd-datetime-mechanism.c \ - gsd-datetime-mechanism.h \ - gsd-datetime-mechanism-fedora.c \ - gsd-datetime-mechanism-fedora.h \ - gsd-datetime-mechanism-debian.c \ - gsd-datetime-mechanism-debian.h \ - gsd-datetime-mechanism-suse.c \ - gsd-datetime-mechanism-suse.h \ - gsd-datetime-mechanism-main.c \ - system-timezone.c \ - system-timezone.h - - -if HAVE_POLKIT -BUILT_SOURCES = gsd-datetime-mechanism-glue.h -endif - -AM_CFLAGS = $(POLKIT_CFLAGS) -gsd_datetime_mechanism_LDADD = $(POLKIT_LIBS) - -test_system_timezone_SOURCES = test-system-timezone.c system-timezone.c system-timezone.h -test_system_timezone_LDADD = $(POLKIT_LIBS) - -if HAVE_POLKIT -dbus_services_DATA = $(dbus_services_in_files:.service.in=.service) - -$(dbus_services_DATA): $(dbus_services_in_files) - $(AM_V_GEN)sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ - -dbus_conf_DATA = org.gnome.SettingsDaemon.DateTimeMechanism.conf - -@INTLTOOL_POLICY_RULE@ -polkit_DATA = $(polkit_in_files:.policy.in=.policy) - -else -dbus_services_DATA = -dbus_conf_DATA = -polkit_DATA = -endif - -EXTRA_DIST = \ - $(dbus_services_in_files) \ - org.gnome.SettingsDaemon.DateTimeMechanism.conf \ - $(polkit_in_files) \ - gsd-datetime-mechanism.xml - -CLEANFILES = \ - org.gnome.SettingsDaemon.DateTimeMechanism.service \ - org.gnome.settingsdaemon.datetimemechanism.policy \ - $(BUILT_SOURCES) diff --git a/plugins/datetime/gsd-datetime-mechanism-debian.c b/plugins/datetime/gsd-datetime-mechanism-debian.c deleted file mode 100644 index a1e8d17..0000000 --- a/plugins/datetime/gsd-datetime-mechanism-debian.c +++ /dev/null @@ -1,200 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * Copyright (C) 2011 Bastien Nocera <hadess@hadess.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "gsd-datetime-mechanism-debian.h" -#include "gsd-datetime-mechanism.h" - -static void -_get_using_ntpdate (gboolean *can_use, gboolean *is_using, GError ** error) -{ - if (!g_file_test ("/usr/sbin/ntpdate-debian", G_FILE_TEST_EXISTS)) - return; - - *can_use = TRUE; - - if (g_file_test ("/etc/network/if-up.d/ntpdate", G_FILE_TEST_EXISTS)) - *is_using = TRUE; -} - -static void -_get_using_ntpd (gboolean *can_use, gboolean *is_using, GError ** error) -{ - int exit_status; - GError *tmp_error = NULL; - - if (!g_file_test ("/usr/sbin/ntpd", G_FILE_TEST_EXISTS)) - return; - - *can_use = TRUE; - - if (!g_spawn_command_line_sync ("/usr/sbin/service ntp status", - NULL, NULL, &exit_status, &tmp_error)) { - if (error != NULL && *error == NULL) { - *error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning /usr/sbin/service: %s", - tmp_error->message); - } - g_error_free (tmp_error); - return; - } - - if (exit_status == 0) - *is_using = TRUE; -} - -gboolean -_get_using_ntp_debian (DBusGMethodInvocation *context) -{ - gboolean can_use_ntp = FALSE; - gboolean is_using_ntp = FALSE; - GError *error = NULL; - - /* In Debian, ntpdate is used whenever the network comes up. So if - either ntpdate or ntpd is installed and available, can_use is true. - If either is active, is_using is true. */ - _get_using_ntpdate (&can_use_ntp, &is_using_ntp, &error); - _get_using_ntpd (&can_use_ntp, &is_using_ntp, &error); - - if (error == NULL) { - dbus_g_method_return (context, can_use_ntp, is_using_ntp); - return TRUE; - } else { - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } -} - -static void -_set_using_ntpdate (gboolean using_ntp, GError **error) -{ - const gchar *cmd = NULL; - GError *tmp_error = NULL; - - /* Debian uses an if-up.d script to sync network time when an interface - comes up. This is a separate mechanism from ntpd altogether. */ - -#define NTPDATE_ENABLED "/etc/network/if-up.d/ntpdate" -#define NTPDATE_DISABLED "/etc/network/if-up.d/ntpdate.disabled" - - if (using_ntp && g_file_test (NTPDATE_DISABLED, G_FILE_TEST_EXISTS)) - cmd = "/bin/mv -f "NTPDATE_DISABLED" "NTPDATE_ENABLED; - else if (!using_ntp && g_file_test (NTPDATE_ENABLED, G_FILE_TEST_EXISTS)) - cmd = "/bin/mv -f "NTPDATE_ENABLED" "NTPDATE_DISABLED; - else - return; - - if (!g_spawn_command_line_sync (cmd, NULL, NULL, NULL, &tmp_error)) { - if (error != NULL && *error == NULL) { - *error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning /bin/mv: %s", - tmp_error->message); - } - g_error_free (tmp_error); - return; - } - - /* Kick start ntpdate to sync time immediately */ - if (using_ntp && - !g_spawn_command_line_sync ("/etc/network/if-up.d/ntpdate", - NULL, NULL, NULL, &tmp_error)) { - if (error != NULL && *error == NULL) { - *error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning /etc/network/if-up.d/ntpdate: %s", - tmp_error->message); - } - g_error_free (tmp_error); - return; - } -} - -static void -_set_using_ntpd (gboolean using_ntp, GError **error) -{ - GError *tmp_error = NULL; - int exit_status; - char *cmd; - - if (!g_file_test ("/usr/sbin/ntpd", G_FILE_TEST_EXISTS)) - return; - - cmd = g_strconcat ("/usr/sbin/update-rc.d ntp ", using_ntp ? "enable" : "disable", NULL); - - if (!g_spawn_command_line_sync (cmd, NULL, NULL, &exit_status, &tmp_error)) { - if (error != NULL && *error == NULL) { - *error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning '%s': %s", - cmd, tmp_error->message); - } - g_error_free (tmp_error); - g_free (cmd); - return; - } - - g_free (cmd); - - cmd = g_strconcat ("/usr/sbin/service ntp ", using_ntp ? "restart" : "stop", NULL);; - - if (!g_spawn_command_line_sync (cmd, NULL, NULL, &exit_status, &tmp_error)) { - if (error != NULL && *error == NULL) { - *error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning '%s': %s", - cmd, tmp_error->message); - } - g_error_free (tmp_error); - g_free (cmd); - return; - } - - g_free (cmd); -} - -gboolean -_set_using_ntp_debian (DBusGMethodInvocation *context, - gboolean using_ntp) -{ - GError *error = NULL; - - /* In Debian, ntpdate and ntpd may be installed separately, so don't - assume both are valid. */ - - _set_using_ntpdate (using_ntp, &error); - _set_using_ntpd (using_ntp, &error); - - if (error == NULL) { - dbus_g_method_return (context); - return TRUE; - } else { - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } -} - diff --git a/plugins/datetime/gsd-datetime-mechanism-debian.h b/plugins/datetime/gsd-datetime-mechanism-debian.h deleted file mode 100644 index ca2ad60..0000000 --- a/plugins/datetime/gsd-datetime-mechanism-debian.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * Copyright (C) 2011 Bastien Nocera <hadess@hadess.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include <glib.h> -#include <dbus/dbus-glib.h> - -gboolean _get_using_ntp_debian (DBusGMethodInvocation *context); -gboolean _set_using_ntp_debian (DBusGMethodInvocation *context, - gboolean using_ntp); diff --git a/plugins/datetime/gsd-datetime-mechanism-fedora.c b/plugins/datetime/gsd-datetime-mechanism-fedora.c deleted file mode 100644 index 74fcf0e..0000000 --- a/plugins/datetime/gsd-datetime-mechanism-fedora.c +++ /dev/null @@ -1,209 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * Copyright (C) 2011 Bastien Nocera <hadess@hadess.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <string.h> - -#include "gsd-datetime-mechanism-fedora.h" -#include "gsd-datetime-mechanism.h" - -/* Return the name of the installed NTP client, prefer chrony if both chrony - * and ntp are installed */ -static const char * -get_ntp_client () -{ - if (g_file_test ("/etc/chrony.conf", G_FILE_TEST_EXISTS)) - return "chronyd"; - else if (g_file_test ("/etc/ntp.conf", G_FILE_TEST_EXISTS)) - return "ntpd"; - return NULL; -} - -gboolean -_get_using_ntp_fedora (DBusGMethodInvocation *context) -{ - int exit_status; - GError *error = NULL; - gboolean can_use_ntp; - gboolean is_using_ntp; - const char *ntp_client; - char *cmd; - - ntp_client = get_ntp_client (); - if (ntp_client) { - can_use_ntp = TRUE; - cmd = g_strconcat ("/sbin/service ", ntp_client, " status", NULL); - if (!g_spawn_command_line_sync (cmd, - NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning /sbin/service: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (cmd); - return FALSE; - } - g_free (cmd); - if (exit_status == 0) - is_using_ntp = TRUE; - else - is_using_ntp = FALSE; - } - else { - can_use_ntp = FALSE; - is_using_ntp = FALSE; - } - - dbus_g_method_return (context, can_use_ntp, is_using_ntp); - return TRUE; -} - -gboolean -_set_using_ntp_fedora (DBusGMethodInvocation *context, - gboolean using_ntp) -{ - GError *error; - int exit_status; - const char *ntp_client; - char *cmd; - - error = NULL; - - ntp_client = get_ntp_client (); - - /* We omit --level 2345 so that systemd doesn't try to use the - * SysV init scripts */ - cmd = g_strconcat ("/sbin/chkconfig ", ntp_client, " ", using_ntp ? "on" : "off", NULL); - - if (!g_spawn_command_line_sync (cmd, - NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning '%s': %s", cmd, error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (cmd); - return FALSE; - } - - g_free (cmd); - - cmd = g_strconcat ("/sbin/service ", ntp_client, " ", using_ntp ? "restart" : "stop", NULL);; - - if (!g_spawn_command_line_sync (cmd, - NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning '%s': %s", cmd, error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (cmd); - return FALSE; - } - - g_free (cmd); - - dbus_g_method_return (context); - return TRUE; -} - -gboolean -_update_etc_sysconfig_clock_fedora (DBusGMethodInvocation *context, const char *key, const char *value) -{ - char **lines; - int n; - gboolean replaced; - char *data; - gsize len; - GError *error; - - /* On Red Hat / Fedora, the /etc/sysconfig/clock file needs to be kept in sync */ - if (!g_file_test ("/etc/sysconfig/clock", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error reading /etc/sysconfig/clock file: %s", "No such file"); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - - error = NULL; - - if (!g_file_get_contents ("/etc/sysconfig/clock", &data, &len, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error reading /etc/sysconfig/clock file: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - return FALSE; - } - replaced = FALSE; - lines = g_strsplit (data, "\n", 0); - g_free (data); - - for (n = 0; lines[n] != NULL; n++) { - if (g_str_has_prefix (lines[n], key)) { - g_free (lines[n]); - lines[n] = g_strdup_printf ("%s%s", key, value); - replaced = TRUE; - } - } - if (replaced) { - GString *str; - - str = g_string_new (NULL); - for (n = 0; lines[n] != NULL; n++) { - g_string_append (str, lines[n]); - if (lines[n + 1] != NULL) - g_string_append_c (str, '\n'); - } - data = g_string_free (str, FALSE); - len = strlen (data); - if (!g_file_set_contents ("/etc/sysconfig/clock", data, len, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error updating /etc/sysconfig/clock: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (data); - return FALSE; - } - g_free (data); - } - g_strfreev (lines); - - return TRUE; -} - - diff --git a/plugins/datetime/gsd-datetime-mechanism-fedora.h b/plugins/datetime/gsd-datetime-mechanism-fedora.h deleted file mode 100644 index 0e30581..0000000 --- a/plugins/datetime/gsd-datetime-mechanism-fedora.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * Copyright (C) 2011 Bastien Nocera <hadess@hadess.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include <glib.h> -#include <dbus/dbus-glib.h> - -gboolean _get_using_ntp_fedora (DBusGMethodInvocation *context); -gboolean _set_using_ntp_fedora (DBusGMethodInvocation *context, - gboolean using_ntp); -gboolean _update_etc_sysconfig_clock_fedora - (DBusGMethodInvocation *context, - const char *key, - const char *value); diff --git a/plugins/datetime/gsd-datetime-mechanism-main.c b/plugins/datetime/gsd-datetime-mechanism-main.c deleted file mode 100644 index b1f580a..0000000 --- a/plugins/datetime/gsd-datetime-mechanism-main.c +++ /dev/null @@ -1,171 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> -#include <signal.h> -#include <errno.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> - -#include <glib.h> -#include <glib-object.h> - -#include <dbus/dbus-glib.h> -#include <dbus/dbus-glib-lowlevel.h> - - -#include "gsd-datetime-mechanism.h" - -static DBusGProxy * -get_bus_proxy (DBusGConnection *connection) -{ - DBusGProxy *bus_proxy; - - bus_proxy = dbus_g_proxy_new_for_name (connection, - DBUS_SERVICE_DBUS, - DBUS_PATH_DBUS, - DBUS_INTERFACE_DBUS); - return bus_proxy; -} - -#define BUS_NAME "org.gnome.SettingsDaemon.DateTimeMechanism" - -static gboolean -acquire_name_on_proxy (DBusGProxy *bus_proxy) -{ - GError *error; - guint result; - gboolean res; - gboolean ret; - - ret = FALSE; - - if (bus_proxy == NULL) { - goto out; - } - - error = NULL; - res = dbus_g_proxy_call (bus_proxy, - "RequestName", - &error, - G_TYPE_STRING, BUS_NAME, - G_TYPE_UINT, 0, - G_TYPE_INVALID, - G_TYPE_UINT, &result, - G_TYPE_INVALID); - if (! res) { - if (error != NULL) { - g_warning ("Failed to acquire %s: %s", BUS_NAME, error->message); - g_error_free (error); - } else { - g_warning ("Failed to acquire %s", BUS_NAME); - } - goto out; - } - - if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - if (error != NULL) { - g_warning ("Failed to acquire %s: %s", BUS_NAME, error->message); - g_error_free (error); - } else { - g_warning ("Failed to acquire %s", BUS_NAME); - } - goto out; - } - - ret = TRUE; - - out: - return ret; -} - -static DBusGConnection * -get_system_bus (void) -{ - GError *error; - DBusGConnection *bus; - - error = NULL; - bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (bus == NULL) { - g_warning ("Couldn't connect to system bus: %s", error->message); - g_error_free (error); - } - return bus; -} - -int -main (int argc, char **argv) -{ - GMainLoop *loop; - GsdDatetimeMechanism *mechanism; - DBusGProxy *bus_proxy; - DBusGConnection *connection; - int ret; - - ret = 1; - - if (! g_thread_supported ()) { - g_thread_init (NULL); - } - dbus_g_thread_init (); - g_type_init (); - - connection = get_system_bus (); - if (connection == NULL) { - goto out; - } - - bus_proxy = get_bus_proxy (connection); - if (bus_proxy == NULL) { - g_warning ("Could not construct bus_proxy object; bailing out"); - goto out; - } - - if (!acquire_name_on_proxy (bus_proxy) ) { - g_warning ("Could not acquire name; bailing out"); - goto out; - } - - mechanism = gsd_datetime_mechanism_new (); - - if (mechanism == NULL) { - goto out; - } - - loop = g_main_loop_new (NULL, FALSE); - - g_main_loop_run (loop); - - g_object_unref (mechanism); - g_main_loop_unref (loop); - ret = 0; - -out: - return ret; -} diff --git a/plugins/datetime/gsd-datetime-mechanism-suse.c b/plugins/datetime/gsd-datetime-mechanism-suse.c deleted file mode 100644 index ae32045..0000000 --- a/plugins/datetime/gsd-datetime-mechanism-suse.c +++ /dev/null @@ -1,187 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * Copyright (C) 2011 Bastien Nocera <hadess@hadess.net> - * Copyright (C) 2011 Vincent Untz <vuntz@gnome.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <string.h> - -#include "gsd-datetime-mechanism-suse.h" -#include "gsd-datetime-mechanism.h" - -gboolean -_get_using_ntp_suse (DBusGMethodInvocation *context) -{ - int exit_status; - GError *error = NULL; - gboolean can_use_ntp; - gboolean is_using_ntp; - - if (g_file_test ("/etc/ntp.conf", G_FILE_TEST_EXISTS)) { - can_use_ntp = TRUE; - if (!g_spawn_command_line_sync ("/sbin/service ntp status", - NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning /sbin/service: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - return FALSE; - } - if (exit_status == 0) - is_using_ntp = TRUE; - else - is_using_ntp = FALSE; - } - else { - can_use_ntp = FALSE; - is_using_ntp = FALSE; - } - - dbus_g_method_return (context, can_use_ntp, is_using_ntp); - return TRUE; -} - -gboolean -_set_using_ntp_suse (DBusGMethodInvocation *context, - gboolean using_ntp) -{ - GError *error; - int exit_status; - char *cmd; - - error = NULL; - - /* We omit --level 2345 so that systemd doesn't try to use the - * SysV init scripts */ - cmd = g_strconcat ("/sbin/chkconfig ntp ", using_ntp ? "on" : "off", NULL); - - if (!g_spawn_command_line_sync (cmd, - NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning '%s': %s", cmd, error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (cmd); - return FALSE; - } - - g_free (cmd); - - cmd = g_strconcat ("/sbin/service ntp ", using_ntp ? "restart" : "stop", NULL);; - - if (!g_spawn_command_line_sync (cmd, - NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning '%s': %s", cmd, error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (cmd); - return FALSE; - } - - g_free (cmd); - - dbus_g_method_return (context); - return TRUE; -} - -gboolean -_update_etc_sysconfig_clock_suse (DBusGMethodInvocation *context, const char *key, const char *value) -{ - char **lines; - int n; - gboolean replaced; - char *data; - gsize len; - GError *error; - - /* On SUSE variants, the /etc/sysconfig/clock file needs to be kept in sync */ - if (!g_file_test ("/etc/sysconfig/clock", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error reading /etc/sysconfig/clock file: %s", "No such file"); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - - error = NULL; - - if (!g_file_get_contents ("/etc/sysconfig/clock", &data, &len, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error reading /etc/sysconfig/clock file: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - return FALSE; - } - replaced = FALSE; - lines = g_strsplit (data, "\n", 0); - g_free (data); - - for (n = 0; lines[n] != NULL; n++) { - if (g_str_has_prefix (lines[n], key)) { - g_free (lines[n]); - lines[n] = g_strdup_printf ("%s%s", key, value); - replaced = TRUE; - } - } - if (replaced) { - GString *str; - - str = g_string_new (NULL); - for (n = 0; lines[n] != NULL; n++) { - g_string_append (str, lines[n]); - if (lines[n + 1] != NULL) - g_string_append_c (str, '\n'); - } - data = g_string_free (str, FALSE); - len = strlen (data); - if (!g_file_set_contents ("/etc/sysconfig/clock", data, len, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error updating /etc/sysconfig/clock: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (data); - return FALSE; - } - g_free (data); - } - g_strfreev (lines); - - return TRUE; -} diff --git a/plugins/datetime/gsd-datetime-mechanism-suse.h b/plugins/datetime/gsd-datetime-mechanism-suse.h deleted file mode 100644 index a228597..0000000 --- a/plugins/datetime/gsd-datetime-mechanism-suse.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * Copyright (C) 2011 Bastien Nocera <hadess@hadess.net> - * Copyright (C) 2011 Vincent Untz <vuntz@gnome.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include <glib.h> -#include <dbus/dbus-glib.h> - -gboolean _get_using_ntp_suse (DBusGMethodInvocation *context); -gboolean _set_using_ntp_suse (DBusGMethodInvocation *context, - gboolean using_ntp); -gboolean _update_etc_sysconfig_clock_suse - (DBusGMethodInvocation *context, - const char *key, - const char *value); diff --git a/plugins/datetime/gsd-datetime-mechanism.c b/plugins/datetime/gsd-datetime-mechanism.c deleted file mode 100644 index 61d195f..0000000 --- a/plugins/datetime/gsd-datetime-mechanism.c +++ /dev/null @@ -1,772 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <stdlib.h> -#include <stdio.h> -#include <fcntl.h> -#include <unistd.h> -#include <string.h> -#include <sys/wait.h> -#include <errno.h> -#include <sys/time.h> - -#include <glib.h> -#include <glib-object.h> - -#include <dbus/dbus-glib.h> -#include <dbus/dbus-glib-lowlevel.h> - -#include <polkit/polkit.h> - -#include "system-timezone.h" - -#include "gsd-datetime-mechanism.h" -#include "gsd-datetime-mechanism-glue.h" - -/* NTP helper functions for various distributions */ -#include "gsd-datetime-mechanism-fedora.h" -#include "gsd-datetime-mechanism-debian.h" -#include "gsd-datetime-mechanism-suse.h" - -static gboolean -do_exit (gpointer user_data) -{ - g_debug ("Exiting due to inactivity"); - exit (1); - return FALSE; -} - -static void -reset_killtimer (void) -{ - static guint timer_id = 0; - - if (timer_id > 0) { - g_source_remove (timer_id); - } - g_debug ("Setting killtimer to 30 seconds..."); - timer_id = g_timeout_add_seconds (30, do_exit, NULL); -} - -struct GsdDatetimeMechanismPrivate -{ - DBusGConnection *system_bus_connection; - DBusGProxy *system_bus_proxy; - PolkitAuthority *auth; -}; - -static void gsd_datetime_mechanism_finalize (GObject *object); - -G_DEFINE_TYPE (GsdDatetimeMechanism, gsd_datetime_mechanism, G_TYPE_OBJECT) - -#define GSD_DATETIME_MECHANISM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_DATETIME_TYPE_MECHANISM, GsdDatetimeMechanismPrivate)) - -GQuark -gsd_datetime_mechanism_error_quark (void) -{ - static GQuark ret = 0; - - if (ret == 0) { - ret = g_quark_from_static_string ("gsd_datetime_mechanism_error"); - } - - return ret; -} - - -#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } - -GType -gsd_datetime_mechanism_error_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) - { - static const GEnumValue values[] = - { - ENUM_ENTRY (GSD_DATETIME_MECHANISM_ERROR_GENERAL, "GeneralError"), - ENUM_ENTRY (GSD_DATETIME_MECHANISM_ERROR_NOT_PRIVILEGED, "NotPrivileged"), - ENUM_ENTRY (GSD_DATETIME_MECHANISM_ERROR_INVALID_TIMEZONE_FILE, "InvalidTimezoneFile"), - { 0, 0, 0 } - }; - - g_assert (GSD_DATETIME_MECHANISM_NUM_ERRORS == G_N_ELEMENTS (values) - 1); - - etype = g_enum_register_static ("GsdDatetimeMechanismError", values); - } - - return etype; -} - - -static GObject * -gsd_datetime_mechanism_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) -{ - GsdDatetimeMechanism *mechanism; - - mechanism = GSD_DATETIME_MECHANISM (G_OBJECT_CLASS (gsd_datetime_mechanism_parent_class)->constructor ( - type, - n_construct_properties, - construct_properties)); - - return G_OBJECT (mechanism); -} - -static void -gsd_datetime_mechanism_class_init (GsdDatetimeMechanismClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->constructor = gsd_datetime_mechanism_constructor; - object_class->finalize = gsd_datetime_mechanism_finalize; - - g_type_class_add_private (klass, sizeof (GsdDatetimeMechanismPrivate)); - - dbus_g_object_type_install_info (GSD_DATETIME_TYPE_MECHANISM, &dbus_glib_gsd_datetime_mechanism_object_info); - - dbus_g_error_domain_register (GSD_DATETIME_MECHANISM_ERROR, NULL, GSD_DATETIME_MECHANISM_TYPE_ERROR); - -} - -static void -gsd_datetime_mechanism_init (GsdDatetimeMechanism *mechanism) -{ - mechanism->priv = GSD_DATETIME_MECHANISM_GET_PRIVATE (mechanism); - -} - -static void -gsd_datetime_mechanism_finalize (GObject *object) -{ - GsdDatetimeMechanism *mechanism; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSD_DATETIME_IS_MECHANISM (object)); - - mechanism = GSD_DATETIME_MECHANISM (object); - - g_return_if_fail (mechanism->priv != NULL); - - g_object_unref (mechanism->priv->system_bus_proxy); - - G_OBJECT_CLASS (gsd_datetime_mechanism_parent_class)->finalize (object); -} - -static gboolean -register_mechanism (GsdDatetimeMechanism *mechanism) -{ - GError *error = NULL; - - mechanism->priv->auth = polkit_authority_get_sync (NULL, &error); - if (mechanism->priv->auth == NULL) { - if (error != NULL) { - g_critical ("error getting system bus: %s", error->message); - g_error_free (error); - } - goto error; - } - - mechanism->priv->system_bus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (mechanism->priv->system_bus_connection == NULL) { - if (error != NULL) { - g_critical ("error getting system bus: %s", error->message); - g_error_free (error); - } - goto error; - } - - dbus_g_connection_register_g_object (mechanism->priv->system_bus_connection, "/", - G_OBJECT (mechanism)); - - mechanism->priv->system_bus_proxy = dbus_g_proxy_new_for_name (mechanism->priv->system_bus_connection, - DBUS_SERVICE_DBUS, - DBUS_PATH_DBUS, - DBUS_INTERFACE_DBUS); - - reset_killtimer (); - - return TRUE; - -error: - return FALSE; -} - - -GsdDatetimeMechanism * -gsd_datetime_mechanism_new (void) -{ - GObject *object; - gboolean res; - - object = g_object_new (GSD_DATETIME_TYPE_MECHANISM, NULL); - - res = register_mechanism (GSD_DATETIME_MECHANISM (object)); - if (! res) { - g_object_unref (object); - return NULL; - } - - return GSD_DATETIME_MECHANISM (object); -} - -static gboolean -_check_polkit_for_action (GsdDatetimeMechanism *mechanism, DBusGMethodInvocation *context) -{ - const char *action = "org.gnome.settingsdaemon.datetimemechanism.configure"; - const char *sender; - GError *error; - PolkitSubject *subject; - PolkitAuthorizationResult *result; - - error = NULL; - - /* Check that caller is privileged */ - sender = dbus_g_method_get_sender (context); - subject = polkit_system_bus_name_new (sender); - - result = polkit_authority_check_authorization_sync (mechanism->priv->auth, - subject, - action, - NULL, - POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION, - NULL, &error); - g_object_unref (subject); - - if (error) { - dbus_g_method_return_error (context, error); - g_error_free (error); - - return FALSE; - } - - if (!polkit_authorization_result_get_is_authorized (result)) { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_NOT_PRIVILEGED, - "Not Authorized for action %s", action); - dbus_g_method_return_error (context, error); - g_error_free (error); - g_object_unref (result); - - return FALSE; - } - - g_object_unref (result); - - return TRUE; -} - -static gboolean -_sync_hwclock (DBusGMethodInvocation *context) -{ - GError *error; - - error = NULL; - - if (g_file_test ("/sbin/hwclock", - G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_EXECUTABLE)) { - int exit_status; - if (!g_spawn_command_line_sync ("/sbin/hwclock --systohc", NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning /sbin/hwclock: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - return FALSE; - } - if (WEXITSTATUS (exit_status) != 0) { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "/sbin/hwclock returned %d", exit_status); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - } - - return TRUE; -} - -static gboolean -_set_time (GsdDatetimeMechanism *mechanism, - const struct timeval *tv, - DBusGMethodInvocation *context) -{ - GError *error; - - if (!_check_polkit_for_action (mechanism, context)) - return FALSE; - - if (settimeofday (tv, NULL) != 0) { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error calling settimeofday({%lld,%lld}): %s", - (gint64) tv->tv_sec, (gint64) tv->tv_usec, - strerror (errno)); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - - if (!_sync_hwclock (context)) - return FALSE; - - dbus_g_method_return (context); - return TRUE; -} - -static gboolean -_set_date (GsdDatetimeMechanism *mechanism, - guint day, - guint month, - guint year, - DBusGMethodInvocation *context) -{ - GDateTime *time; - char *date_str, *time_str; - char *date_cmd; - int exit_status; - GError *error; - - date_str = g_strdup_printf ("%02d/%02d/%d", month, day, year); - error = NULL; - - time = g_date_time_new_now_local (); - time_str = g_date_time_format (time, "%R:%S"); - g_date_time_unref (time); - - date_cmd = g_strdup_printf ("/bin/date -s \"%s %s\" +\"%%D %%R:%%S\"", date_str, time_str); - g_free (date_str); - g_free (time_str); - - if (!g_spawn_command_line_sync (date_cmd, NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning /bin/date: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (date_cmd); - return FALSE; - } - g_free (date_cmd); - if (WEXITSTATUS (exit_status) != 0) { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "/bin/date returned %d", exit_status); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - - if (!_sync_hwclock (context)) - return FALSE; - - return TRUE; -} - -/* exported methods */ - -gboolean -gsd_datetime_mechanism_set_time (GsdDatetimeMechanism *mechanism, - gint64 seconds_since_epoch, - DBusGMethodInvocation *context) -{ - struct timeval tv; - - reset_killtimer (); - g_debug ("SetTime(%" G_GINT64_FORMAT ") called", seconds_since_epoch); - - tv.tv_sec = (time_t) seconds_since_epoch; - tv.tv_usec = 0; - return _set_time (mechanism, &tv, context); -} - -gboolean -gsd_datetime_mechanism_set_date (GsdDatetimeMechanism *mechanism, - guint day, - guint month, - guint year, - DBusGMethodInvocation *context) -{ - reset_killtimer (); - g_debug ("SetDate(%d, %d, %d) called", day, month, year); - - return _set_date (mechanism, day, month, year, context); -} - -gboolean -gsd_datetime_mechanism_adjust_time (GsdDatetimeMechanism *mechanism, - gint64 seconds_to_add, - DBusGMethodInvocation *context) -{ - struct timeval tv; - - reset_killtimer (); - g_debug ("AdjustTime(%" G_GINT64_FORMAT " ) called", seconds_to_add); - - if (gettimeofday (&tv, NULL) != 0) { - GError *error; - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error calling gettimeofday(): %s", strerror (errno)); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - - tv.tv_sec += (time_t) seconds_to_add; - return _set_time (mechanism, &tv, context); -} - -static gboolean -gsd_datetime_check_tz_name (const char *tz, - GError **error) -{ - GFile *file; - char *tz_path, *actual_path; - gboolean retval; - - retval = TRUE; - tz_path = g_build_filename (SYSTEM_ZONEINFODIR, tz, NULL); - - /* Get the actual resolved path */ - file = g_file_new_for_path (tz_path); - actual_path = g_file_get_path (file); - g_object_unref (file); - - /* The tz name passed had relative paths in it */ - if (g_strcmp0 (tz_path, actual_path) != 0) { - g_set_error (error, GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_INVALID_TIMEZONE_FILE, - "Timezone file '%s' was invalid.", - tz); - retval = FALSE; - } - - g_free (tz_path); - g_free (actual_path); - - return retval; -} - -gboolean -gsd_datetime_mechanism_set_timezone (GsdDatetimeMechanism *mechanism, - const char *tz, - DBusGMethodInvocation *context) -{ - GError *error; - - reset_killtimer (); - g_debug ("SetTimezone('%s') called", tz); - - if (!_check_polkit_for_action (mechanism, context)) - return FALSE; - - error = NULL; - - if (!gsd_datetime_check_tz_name (tz, &error)) - return FALSE; - - if (!system_timezone_set (tz, &error)) { - GError *error2; - int code; - - if (error->code == SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE) - code = GSD_DATETIME_MECHANISM_ERROR_INVALID_TIMEZONE_FILE; - else - code = GSD_DATETIME_MECHANISM_ERROR_GENERAL; - - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - code, "%s", error->message); - - g_error_free (error); - - dbus_g_method_return_error (context, error2); - g_error_free (error2); - - return FALSE; - } - - dbus_g_method_return (context); - return TRUE; -} - - -gboolean -gsd_datetime_mechanism_get_timezone (GsdDatetimeMechanism *mechism, - DBusGMethodInvocation *context) -{ - gchar *timezone; - - reset_killtimer (); - - timezone = system_timezone_find (); - - dbus_g_method_return (context, timezone); - - return TRUE; -} - -gboolean -gsd_datetime_mechanism_get_hardware_clock_using_utc (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context) -{ - char **lines; - char *data; - gsize len; - GError *error; - gboolean is_utc; - - error = NULL; - - if (!g_file_get_contents ("/etc/adjtime", &data, &len, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error reading /etc/adjtime file: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - return FALSE; - } - - lines = g_strsplit (data, "\n", 0); - g_free (data); - - if (g_strv_length (lines) < 3) { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Cannot parse /etc/adjtime"); - dbus_g_method_return_error (context, error); - g_error_free (error); - g_strfreev (lines); - return FALSE; - } - - if (strcmp (lines[2], "UTC") == 0) { - is_utc = TRUE; - } else if (strcmp (lines[2], "LOCAL") == 0) { - is_utc = FALSE; - } else { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Expected UTC or LOCAL at line 3 of /etc/adjtime; found '%s'", lines[2]); - dbus_g_method_return_error (context, error); - g_error_free (error); - g_strfreev (lines); - return FALSE; - } - g_strfreev (lines); - dbus_g_method_return (context, is_utc); - return TRUE; -} - -gboolean -gsd_datetime_mechanism_set_hardware_clock_using_utc (GsdDatetimeMechanism *mechanism, - gboolean using_utc, - DBusGMethodInvocation *context) -{ - GError *error; - - error = NULL; - - if (!_check_polkit_for_action (mechanism, context)) - return FALSE; - - if (g_file_test ("/sbin/hwclock", - G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_EXECUTABLE)) { - int exit_status; - char *cmd; - cmd = g_strdup_printf ("/sbin/hwclock %s --systohc", using_utc ? "--utc" : "--localtime"); - if (!g_spawn_command_line_sync (cmd, NULL, NULL, &exit_status, &error)) { - GError *error2; - error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error spawning /sbin/hwclock: %s", error->message); - g_error_free (error); - dbus_g_method_return_error (context, error2); - g_error_free (error2); - g_free (cmd); - return FALSE; - } - g_free (cmd); - if (WEXITSTATUS (exit_status) != 0) { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "/sbin/hwclock returned %d", exit_status); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - - if (g_file_test ("/etc/fedora-release", G_FILE_TEST_EXISTS)) { /* Fedora */ - if (!_update_etc_sysconfig_clock_fedora (context, "UTC=", using_utc ? "true" : "false")) - return FALSE; - } else if (g_file_test ("/etc/SuSE-release", G_FILE_TEST_EXISTS)) { /* SUSE variant */ - if (!_update_etc_sysconfig_clock_suse (context, "HWCLOCK=", using_utc ? "-u" : "--localtime")) - return FALSE; - } - } - dbus_g_method_return (context); - return TRUE; -} - -gboolean -gsd_datetime_mechanism_get_using_ntp (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context) -{ - GError *error = NULL; - gboolean ret; - - if (g_file_test ("/etc/fedora-release", G_FILE_TEST_EXISTS)) /* Fedora */ - ret = _get_using_ntp_fedora (context); - else if (g_file_test ("/usr/sbin/update-rc.d", G_FILE_TEST_EXISTS)) /* Debian */ - ret = _get_using_ntp_debian (context); - else if (g_file_test ("/etc/SuSE-release", G_FILE_TEST_EXISTS)) /* SUSE variant */ - ret = _get_using_ntp_suse (context); - else { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error enabling NTP: OS variant not supported"); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - - return ret; -} - -gboolean -gsd_datetime_mechanism_set_using_ntp (GsdDatetimeMechanism *mechanism, - gboolean using_ntp, - DBusGMethodInvocation *context) -{ - GError *error; - gboolean ret; - - error = NULL; - - if (!_check_polkit_for_action (mechanism, context)) - return FALSE; - - if (g_file_test ("/etc/fedora-release", G_FILE_TEST_EXISTS)) /* Fedora */ - ret = _set_using_ntp_fedora (context, using_ntp); - else if (g_file_test ("/usr/sbin/update-rc.d", G_FILE_TEST_EXISTS)) /* Debian */ - ret = _set_using_ntp_debian (context, using_ntp); - else if (g_file_test ("/etc/SuSE-release", G_FILE_TEST_EXISTS)) /* SUSE variant */ - ret = _set_using_ntp_suse (context, using_ntp); - else { - error = g_error_new (GSD_DATETIME_MECHANISM_ERROR, - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - "Error enabling NTP: OS variant not supported"); - dbus_g_method_return_error (context, error); - g_error_free (error); - return FALSE; - } - - return ret; -} - -static void -check_can_do (GsdDatetimeMechanism *mechanism, - const char *action, - DBusGMethodInvocation *context) -{ - const char *sender; - PolkitSubject *subject; - PolkitAuthorizationResult *result; - GError *error; - - /* Check that caller is privileged */ - sender = dbus_g_method_get_sender (context); - subject = polkit_system_bus_name_new (sender); - - error = NULL; - result = polkit_authority_check_authorization_sync (mechanism->priv->auth, - subject, - action, - NULL, - 0, - NULL, - &error); - g_object_unref (subject); - - if (error) { - dbus_g_method_return_error (context, error); - g_error_free (error); - return; - } - - if (polkit_authorization_result_get_is_authorized (result)) { - dbus_g_method_return (context, 2); - } - else if (polkit_authorization_result_get_is_challenge (result)) { - dbus_g_method_return (context, 1); - } - else { - dbus_g_method_return (context, 0); - } - - g_object_unref (result); -} - - -gboolean -gsd_datetime_mechanism_can_set_time (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context) -{ - check_can_do (mechanism, - "org.gnome.settingsdaemon.datetimemechanism.configure", - context); - - return TRUE; -} - -gboolean -gsd_datetime_mechanism_can_set_timezone (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context) -{ - check_can_do (mechanism, - "org.gnome.settingsdaemon.datetimemechanism.configure", - context); - - return TRUE; -} - -gboolean -gsd_datetime_mechanism_can_set_using_ntp (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context) -{ - check_can_do (mechanism, - "org.gnome.settingsdaemon.datetimemechanism.configure", - context); - - return TRUE; -} diff --git a/plugins/datetime/gsd-datetime-mechanism.h b/plugins/datetime/gsd-datetime-mechanism.h deleted file mode 100644 index 1c67cea..0000000 --- a/plugins/datetime/gsd-datetime-mechanism.h +++ /dev/null @@ -1,112 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 David Zeuthen <david@fubar.dk> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef GSD_DATETIME_MECHANISM_H -#define GSD_DATETIME_MECHANISM_H - -#include <glib-object.h> -#include <dbus/dbus-glib.h> - -G_BEGIN_DECLS - -#define GSD_DATETIME_TYPE_MECHANISM (gsd_datetime_mechanism_get_type ()) -#define GSD_DATETIME_MECHANISM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_DATETIME_TYPE_MECHANISM, GsdDatetimeMechanism)) -#define GSD_DATETIME_MECHANISM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_DATETIME_TYPE_MECHANISM, GsdDatetimeMechanismClass)) -#define GSD_DATETIME_IS_MECHANISM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_DATETIME_TYPE_MECHANISM)) -#define GSD_DATETIME_IS_MECHANISM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_DATETIME_TYPE_MECHANISM)) -#define GSD_DATETIME_MECHANISM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_DATETIME_TYPE_MECHANISM, GsdDatetimeMechanismClass)) - -typedef struct GsdDatetimeMechanismPrivate GsdDatetimeMechanismPrivate; - -typedef struct -{ - GObject parent; - GsdDatetimeMechanismPrivate *priv; -} GsdDatetimeMechanism; - -typedef struct -{ - GObjectClass parent_class; -} GsdDatetimeMechanismClass; - -typedef enum -{ - GSD_DATETIME_MECHANISM_ERROR_GENERAL, - GSD_DATETIME_MECHANISM_ERROR_NOT_PRIVILEGED, - GSD_DATETIME_MECHANISM_ERROR_INVALID_TIMEZONE_FILE, - GSD_DATETIME_MECHANISM_NUM_ERRORS -} GsdDatetimeMechanismError; - -#define GSD_DATETIME_MECHANISM_ERROR gsd_datetime_mechanism_error_quark () - -GType gsd_datetime_mechanism_error_get_type (void); -#define GSD_DATETIME_MECHANISM_TYPE_ERROR (gsd_datetime_mechanism_error_get_type ()) - - -GQuark gsd_datetime_mechanism_error_quark (void); -GType gsd_datetime_mechanism_get_type (void); -GsdDatetimeMechanism *gsd_datetime_mechanism_new (void); - -/* exported methods */ -gboolean gsd_datetime_mechanism_get_timezone (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context); -gboolean gsd_datetime_mechanism_set_timezone (GsdDatetimeMechanism *mechanism, - const char *zone_file, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_can_set_timezone (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_set_time (GsdDatetimeMechanism *mechanism, - gint64 seconds_since_epoch, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_set_date (GsdDatetimeMechanism *mechanism, - guint day, - guint month, - guint year, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_can_set_time (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_adjust_time (GsdDatetimeMechanism *mechanism, - gint64 seconds_to_add, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_get_hardware_clock_using_utc (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_set_hardware_clock_using_utc (GsdDatetimeMechanism *mechanism, - gboolean using_utc, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_get_using_ntp (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_set_using_ntp (GsdDatetimeMechanism *mechanism, - gboolean using_ntp, - DBusGMethodInvocation *context); - -gboolean gsd_datetime_mechanism_can_set_using_ntp (GsdDatetimeMechanism *mechanism, - DBusGMethodInvocation *context); -G_END_DECLS - -#endif /* GSD_DATETIME_MECHANISM_H */ diff --git a/plugins/datetime/gsd-datetime-mechanism.xml b/plugins/datetime/gsd-datetime-mechanism.xml deleted file mode 100644 index 4313870..0000000 --- a/plugins/datetime/gsd-datetime-mechanism.xml +++ /dev/null @@ -1,129 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> -<node name="/"> - <interface name="org.gnome.SettingsDaemon.DateTimeMechanism"> - <method name="SetTimezone"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="tz" direction="in" type="s"/> - </method> - - <method name="GetTimezone"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="timezone" direction="out" type="s"/> - </method> - - <method name="CanSetTimezone"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="value" direction="out" type="i"> - <doc:doc> - <doc:summary>Whether the caller can set the timezone</doc:summary> - <doc:description> - <doc:para> - The return value is not a boolean, but an integer with the following meaning: - <doc:list> - <doc:item> - <doc:term>0</doc:term> - <doc:definition>the caller cannot set the timezone</doc:definition> - </doc:item> - <doc:item> - <doc:term>1</doc:term> - <doc:definition>the caller will be challenged before being able to set the timezone</doc:definition> - </doc:item> - <doc:item> - <doc:term>2</doc:term> - <doc:definition>the caller is authorized to set the timezone</doc:definition> - </doc:item> - </doc:list> - </doc:para> - </doc:description> - </doc:doc> - </arg> - </method> - <method name="SetDate"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="day" direction="in" type="u"/> - <arg name="month" direction="in" type="u"/> - <arg name="year" direction="in" type="u"/> - </method> - <method name="SetTime"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="seconds_since_epoch" direction="in" type="x"/> - </method> - <method name="CanSetTime"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="value" direction="out" type="i"> - <doc:doc> - <doc:summary>Whether the caller can set the time</doc:summary> - <doc:description> - <doc:para> - The return value is not a boolean, but an integer with the following meaning: - <doc:list> - <doc:item> - <doc:term>0</doc:term> - <doc:definition>the caller cannot set the time</doc:definition> - </doc:item> - <doc:item> - <doc:term>1</doc:term> - <doc:definition>the caller will be challenged before being able to set the time</doc:definition> - </doc:item> - <doc:item> - <doc:term>2</doc:term> - <doc:definition>the caller is authorized to set the time</doc:definition> - </doc:item> - </doc:list> - </doc:para> - </doc:description> - </doc:doc> - </arg> - </method> - <method name="AdjustTime"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="seconds_to_add" direction="in" type="x"/> - </method> - - <method name="GetHardwareClockUsingUtc"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="is_using_utc" direction="out" type="b"/> - </method> - <method name="SetHardwareClockUsingUtc"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="is_using_utc" direction="in" type="b"/> - </method> - - <method name="GetUsingNtp"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="can_use_ntp" direction="out" type="b"/> - <arg name="is_using_ntp" direction="out" type="b"/> - </method> - <method name="SetUsingNtp"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="is_using_ntp" direction="in" type="b"/> - </method> - <method name="CanSetUsingNtp"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="value" direction="out" type="i"> - <doc:doc> - <doc:summary>Whether the caller can set the "use NTP" setting</doc:summary> - <doc:description> - <doc:para> - The return value is not a boolean, but an integer with the following meaning: - <doc:list> - <doc:item> - <doc:term>0</doc:term> - <doc:definition>the caller cannot change the "use NTP" setting</doc:definition> - </doc:item> - <doc:item> - <doc:term>1</doc:term> - <doc:definition>the caller will be challenged before being able to change "use NTP" setting</doc:definition> - </doc:item> - <doc:item> - <doc:term>2</doc:term> - <doc:definition>the caller is authorized to change the "use NTP" setting</doc:definition> - </doc:item> - </doc:list> - </doc:para> - </doc:description> - </doc:doc> - </arg> - </method> - </interface> -</node> diff --git a/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.conf b/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.conf deleted file mode 100644 index bdb7554..0000000 --- a/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.conf +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- --> - -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- Only root can own the service --> - <policy user="root"> - <allow own="org.gnome.SettingsDaemon.DateTimeMechanism"/> - <allow send_destination="org.gnome.SettingsDaemon.DateTimeMechanism"/> - </policy> - - <!-- Allow anyone to invoke methods on the interfaces --> - <policy context="default"> - <allow send_destination="org.gnome.SettingsDaemon.DateTimeMechanism"/> - </policy> - -</busconfig> diff --git a/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.service.in b/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.service.in deleted file mode 100644 index 6dc8a8a..0000000 --- a/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.service.in +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=org.gnome.SettingsDaemon.DateTimeMechanism -Exec=@LIBEXECDIR@/gsd-datetime-mechanism -User=root diff --git a/plugins/datetime/org.gnome.settingsdaemon.datetimemechanism.policy.in b/plugins/datetime/org.gnome.settingsdaemon.datetimemechanism.policy.in deleted file mode 100644 index 7479c4b..0000000 --- a/plugins/datetime/org.gnome.settingsdaemon.datetimemechanism.policy.in +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> - -<policyconfig> - <vendor>The GNOME Project</vendor> - <vendor_url>http://www.gnome.org/</vendor_url> - <icon_name>gnome-panel-clock</icon_name> - - <action id="org.gnome.settingsdaemon.datetimemechanism.configure"> - <_description>Change system time and date settings</_description> - <_message>To change time or date settings, you need to authenticate.</_message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> - <allow_active>auth_admin_keep</allow_active> - </defaults> - </action> - -</policyconfig> diff --git a/plugins/datetime/system-timezone.c b/plugins/datetime/system-timezone.c deleted file mode 100644 index b47f661..0000000 --- a/plugins/datetime/system-timezone.c +++ /dev/null @@ -1,924 +0,0 @@ -/* System timezone handling - * - * Copyright (C) 2008 Novell, Inc. - * - * Authors: Vincent Untz <vuntz@gnome.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - * - * Some code is based on previous code in clock-location.c and on code from - * tz.c (shipped with version <= 2.22.0). Those files were under the same - * license, with those authors and copyrights: - * - * clock-location.c: - * ================ - * No header, but most of the work was done (AFAIK) by - * Federico Mena Quintero <federico@novell.com> - * Matthias Clasen <mclasen@redhat.com> - * - * tz.c: - * ==== - * Copyright (C) 2000-2001 Ximian, Inc. - * Copyright (C) 2004 Sun Microsystems, Inc. - * - * Authors: Hans Petter Jansson <hpj@ximian.com> - * additional functions by Erwann Chenede <erwann.chenede@sun.com> - * reworked by Vincent Untz <vuntz@gnome.org> - * - * Largely based on Michael Fulbright's work on Anaconda. - */ - -/* FIXME: it'd be nice to filter out the timezones that we might get when - * parsing config files that are not in zone.tab. Note that it's also wrong - * in some cases: eg, in tzdata2008b, Asia/Calcutta got renamed to - * Asia/Kolkata and the old name is not in zone.tab. */ - -#include <string.h> -#include <unistd.h> - -#include <glib.h> -#include <glib/gstdio.h> -#include <gio/gio.h> - -#include "system-timezone.h" - -/* Files that we look at */ -#define ETC_TIMEZONE "/etc/timezone" -#define ETC_TIMEZONE_MAJ "/etc/TIMEZONE" -#define ETC_RC_CONF "/etc/rc.conf" -#define ETC_SYSCONFIG_CLOCK "/etc/sysconfig/clock" -#define ETC_CONF_D_CLOCK "/etc/conf.d/clock" -#define ETC_LOCALTIME "/etc/localtime" - -/* The first 4 characters in a timezone file, from tzfile.h */ -#define TZ_MAGIC "TZif" - -static GObject *systz_singleton = NULL; - -G_DEFINE_TYPE (SystemTimezone, system_timezone, G_TYPE_OBJECT) - -typedef struct { - char *tz; - char *env_tz; -} SystemTimezonePrivate; - -static GObject *system_timezone_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties); -static void system_timezone_finalize (GObject *obj); - -#define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SYSTEM_TIMEZONE_TYPE, SystemTimezonePrivate)) - -SystemTimezone * -system_timezone_new (void) -{ - return g_object_new (SYSTEM_TIMEZONE_TYPE, NULL); -} - -const char * -system_timezone_get (SystemTimezone *systz) -{ - SystemTimezonePrivate *priv; - - g_return_val_if_fail (IS_SYSTEM_TIMEZONE (systz), NULL); - - priv = PRIVATE (systz); - return priv->tz; -} - -const char * -system_timezone_get_env (SystemTimezone *systz) -{ - SystemTimezonePrivate *priv; - - g_return_val_if_fail (IS_SYSTEM_TIMEZONE (systz), NULL); - - priv = PRIVATE (systz); - return priv->env_tz; -} - -static void -system_timezone_class_init (SystemTimezoneClass *class) -{ - GObjectClass *g_obj_class = G_OBJECT_CLASS (class); - - g_obj_class->constructor = system_timezone_constructor; - g_obj_class->finalize = system_timezone_finalize; - - g_type_class_add_private (class, sizeof (SystemTimezonePrivate)); -} - -static void -system_timezone_init (SystemTimezone *systz) -{ - SystemTimezonePrivate *priv = PRIVATE (systz); - - priv->tz = NULL; - priv->env_tz = NULL; -} - -static GObject * -system_timezone_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) -{ - GObject *obj; - SystemTimezonePrivate *priv; - - /* This is a singleton, we don't need to have it per-applet */ - if (systz_singleton) - return g_object_ref (systz_singleton); - - obj = G_OBJECT_CLASS (system_timezone_parent_class)->constructor ( - type, - n_construct_properties, - construct_properties); - - priv = PRIVATE (obj); - - priv->tz = system_timezone_find (); - - priv->env_tz = g_strdup (g_getenv ("TZ")); - - systz_singleton = obj; - - return systz_singleton; -} - -static void -system_timezone_finalize (GObject *obj) -{ - SystemTimezonePrivate *priv = PRIVATE (obj); - - if (priv->tz) { - g_free (priv->tz); - priv->tz = NULL; - } - - if (priv->env_tz) { - g_free (priv->env_tz); - priv->env_tz = NULL; - } - - G_OBJECT_CLASS (system_timezone_parent_class)->finalize (obj); - - g_assert (obj == systz_singleton); - - systz_singleton = NULL; -} - -/* - * Code to deal with the system timezone on all distros. - * There's no dependency on the SystemTimezone GObject here. - * - * Here's what we know: - * - * + /etc/localtime contains the binary data of the timezone. - * It can be a symlink to the actual data file, a hard link to the data - * file, or just a copy. So we can determine the timezone with this - * (reading the symlink, comparing inodes, or comparing content). - * - * + However, most distributions also have the timezone setting - * configured somewhere else. This might be better to read it from there. - * - * Debian/Ubuntu/Gentoo (new): content of /etc/timezone - * Fedora/Mandriva: the ZONE key in /etc/sysconfig/clock - * openSUSE: the TIMEZONE key in /etc/sysconfig/clock - * Solaris/OpenSolaris: the TZ key in /etc/TIMEZONE - * Arch Linux: the TIMEZONE key in /etc/rc.conf - * Gentoo (old): the ZONE key in /etc/conf.d/clock - * - * FIXME: reading the system-tools-backends, it seems there's this too: - * Solaris: the TZ key in /etc/default/init - * /etc/TIMEZONE seems to be a link to /etc/default/init - * - * First, some functions to handle those system config files. - * - */ - -/* This works for Debian and derivatives (including Ubuntu), and new Gentoo */ -static char * -system_timezone_read_etc_timezone (void) -{ - FILE *etc_timezone; - GString *reading; - int c; - - etc_timezone = g_fopen (ETC_TIMEZONE, "r"); - if (!etc_timezone) - return NULL; - - reading = g_string_new (""); - - c = fgetc (etc_timezone); - /* only get the first line, we'll validate the value later */ - while (c != EOF && !g_ascii_isspace (c)) { - reading = g_string_append_c (reading, c); - c = fgetc (etc_timezone); - } - - fclose (etc_timezone); - - if (reading->str && reading->str[0] != '\0') - return g_string_free (reading, FALSE); - else - g_string_free (reading, TRUE); - - return NULL; -} - -static gboolean -system_timezone_write_etc_timezone (const char *tz, - GError **error) -{ - char *content; - GError *our_error; - gboolean retval; - - if (!g_file_test (ETC_TIMEZONE, G_FILE_TEST_IS_REGULAR)) - return TRUE; - - content = g_strdup_printf ("%s\n", tz); - - our_error = NULL; - retval = g_file_set_contents (ETC_TIMEZONE, content, -1, &our_error); - g_free (content); - - if (!retval) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_GENERAL, - ETC_TIMEZONE" cannot be overwritten: %s", - our_error->message); - g_error_free (our_error); - } - - return retval; -} - - -/* Read a file that looks like a key-file (but there's no need for groups) - * and get the last value for a specific key */ -static char * -system_timezone_read_key_file (const char *filename, - const char *key) -{ - GIOChannel *channel; - char *key_eq; - char *line; - char *retval; - - if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR)) - return NULL; - - channel = g_io_channel_new_file (filename, "r", NULL); - if (!channel) - return NULL; - - key_eq = g_strdup_printf ("%s=", key); - retval = NULL; - - while (g_io_channel_read_line (channel, &line, NULL, - NULL, NULL) == G_IO_STATUS_NORMAL) { - if (g_str_has_prefix (line, key_eq)) { - char *value; - int len; - - value = line + strlen (key_eq); - g_strstrip (value); - - len = strlen (value); - - if (value[0] == '\"') { - if (value[len - 1] == '\"') { - if (retval) - g_free (retval); - - retval = g_strndup (value + 1, - len - 2); - } - } else { - if (retval) - g_free (retval); - - retval = g_strdup (line + strlen (key_eq)); - } - - g_strstrip (retval); - } - - g_free (line); - } - - g_free (key_eq); - g_io_channel_unref (channel); - - return retval; -} - -static gboolean -system_timezone_write_key_file (const char *filename, - const char *key, - const char *value, - GError **error) -{ - GError *our_error; - char *content; - gsize len; - char *key_eq; - char **lines; - gboolean replaced; - gboolean retval; - int n; - - if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR)) - return TRUE; - - our_error = NULL; - - if (!g_file_get_contents (filename, &content, &len, &our_error)) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_GENERAL, - "%s cannot be read: %s", - filename, our_error->message); - g_error_free (our_error); - return FALSE; - } - - lines = g_strsplit (content, "\n", 0); - g_free (content); - - key_eq = g_strdup_printf ("%s=", key); - replaced = FALSE; - - for (n = 0; lines[n] != NULL; n++) { - if (g_str_has_prefix (lines[n], key_eq)) { - char *old_value; - gboolean use_quotes; - - old_value = lines[n] + strlen (key_eq); - g_strstrip (old_value); - use_quotes = old_value[0] == '\"'; - - g_free (lines[n]); - - if (use_quotes) - lines[n] = g_strdup_printf ("%s\"%s\"", - key_eq, value); - else - lines[n] = g_strdup_printf ("%s%s", - key_eq, value); - - replaced = TRUE; - } - } - - g_free (key_eq); - - if (!replaced) { - g_strfreev (lines); - return TRUE; - } - - content = g_strjoinv ("\n", lines); - g_strfreev (lines); - - retval = g_file_set_contents (filename, content, -1, &our_error); - g_free (content); - - if (!retval) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_GENERAL, - "%s cannot be overwritten: %s", - filename, our_error->message); - g_error_free (our_error); - } - - return retval; -} - -/* This works for Solaris/OpenSolaris */ -static char * -system_timezone_read_etc_TIMEZONE (void) -{ - return system_timezone_read_key_file (ETC_TIMEZONE_MAJ, - "TZ"); -} - -static gboolean -system_timezone_write_etc_TIMEZONE (const char *tz, - GError **error) -{ - return system_timezone_write_key_file (ETC_TIMEZONE_MAJ, - "TZ", tz, error); -} - -/* This works for Fedora and Mandriva */ -static char * -system_timezone_read_etc_sysconfig_clock (void) -{ - return system_timezone_read_key_file (ETC_SYSCONFIG_CLOCK, - "ZONE"); -} - -static gboolean -system_timezone_write_etc_sysconfig_clock (const char *tz, - GError **error) -{ - return system_timezone_write_key_file (ETC_SYSCONFIG_CLOCK, - "ZONE", tz, error); -} - -/* This works for openSUSE */ -static char * -system_timezone_read_etc_sysconfig_clock_alt (void) -{ - return system_timezone_read_key_file (ETC_SYSCONFIG_CLOCK, - "TIMEZONE"); -} - -static gboolean -system_timezone_write_etc_sysconfig_clock_alt (const char *tz, - GError **error) -{ - return system_timezone_write_key_file (ETC_SYSCONFIG_CLOCK, - "TIMEZONE", tz, error); -} - -/* This works for old Gentoo */ -static char * -system_timezone_read_etc_conf_d_clock (void) -{ - return system_timezone_read_key_file (ETC_CONF_D_CLOCK, - "TIMEZONE"); -} - -static gboolean -system_timezone_write_etc_conf_d_clock (const char *tz, - GError **error) -{ - return system_timezone_write_key_file (ETC_CONF_D_CLOCK, - "TIMEZONE", tz, error); -} - -/* This works for Arch Linux */ -static char * -system_timezone_read_etc_rc_conf (void) -{ - return system_timezone_read_key_file (ETC_RC_CONF, - "TIMEZONE"); -} - -static gboolean -system_timezone_write_etc_rc_conf (const char *tz, - GError **error) -{ - return system_timezone_write_key_file (ETC_RC_CONF, - "TIMEZONE", tz, error); -} - -/* - * - * First, getting the timezone. - * - */ - -static char * -system_timezone_strip_path_if_valid (const char *filename) -{ - int skip; - - if (!filename || !g_str_has_prefix (filename, SYSTEM_ZONEINFODIR"/")) - return NULL; - - /* Timezone data files also live under posix/ and right/ for some - * reason. - * FIXME: make sure accepting those files is valid. I think "posix" is - * okay, not sure about "right" */ - if (g_str_has_prefix (filename, SYSTEM_ZONEINFODIR"/posix/")) - skip = strlen (SYSTEM_ZONEINFODIR"/posix/"); - else if (g_str_has_prefix (filename, SYSTEM_ZONEINFODIR"/right/")) - skip = strlen (SYSTEM_ZONEINFODIR"/right/"); - else - skip = strlen (SYSTEM_ZONEINFODIR"/"); - - return g_strdup (filename + skip); -} - -/* Read the soft symlink from /etc/localtime */ -static char * -system_timezone_read_etc_localtime_softlink (void) -{ - char *file; - char *tz; - - if (!g_file_test (ETC_LOCALTIME, G_FILE_TEST_IS_SYMLINK)) - return NULL; - - file = g_file_read_link (ETC_LOCALTIME, NULL); - tz = system_timezone_strip_path_if_valid (file); - g_free (file); - - return tz; -} - -typedef gboolean (*CompareFiles) (struct stat *a_stat, - struct stat *b_stat, - const char *a_content, - gsize a_content_len, - const char *b_filename); - -static char * -recursive_compare (struct stat *localtime_stat, - const char *localtime_content, - gsize localtime_content_len, - char *file, - CompareFiles compare_func) -{ - struct stat file_stat; - - if (g_stat (file, &file_stat) != 0) - return NULL; - - if (S_ISREG (file_stat.st_mode)) { - if (compare_func (localtime_stat, - &file_stat, - localtime_content, - localtime_content_len, - file)) - return system_timezone_strip_path_if_valid (file); - else - return NULL; - } else if (S_ISDIR (file_stat.st_mode)) { - GDir *dir = NULL; - char *ret = NULL; - const char *subfile = NULL; - char *subpath = NULL; - - dir = g_dir_open (file, 0, NULL); - if (dir == NULL) - return NULL; - - while ((subfile = g_dir_read_name (dir)) != NULL) { - subpath = g_build_filename (file, subfile, NULL); - - ret = recursive_compare (localtime_stat, - localtime_content, - localtime_content_len, - subpath, - compare_func); - - g_free (subpath); - - if (ret != NULL) - break; - } - - g_dir_close (dir); - - return ret; - } - - return NULL; -} - - -static gboolean -files_are_identical_inode (struct stat *a_stat, - struct stat *b_stat, - const char *a_content, - gsize a_content_len, - const char *b_filename) -{ - return (a_stat->st_ino == b_stat->st_ino); -} - - -/* Determine if /etc/localtime is a hard link to some file, by looking at - * the inodes */ -static char * -system_timezone_read_etc_localtime_hardlink (void) -{ - struct stat stat_localtime; - - if (g_stat (ETC_LOCALTIME, &stat_localtime) != 0) - return NULL; - - if (!S_ISREG (stat_localtime.st_mode)) - return NULL; - - return recursive_compare (&stat_localtime, - NULL, - 0, - SYSTEM_ZONEINFODIR, - files_are_identical_inode); -} - -static gboolean -files_are_identical_content (struct stat *a_stat, - struct stat *b_stat, - const char *a_content, - gsize a_content_len, - const char *b_filename) -{ - char *b_content = NULL; - gsize b_content_len = -1; - int cmp; - - if (a_stat->st_size != b_stat->st_size) - return FALSE; - - if (!g_file_get_contents (b_filename, - &b_content, &b_content_len, NULL)) - return FALSE; - - if (a_content_len != b_content_len) { - g_free (b_content); - return FALSE; - } - - cmp = memcmp (a_content, b_content, a_content_len); - g_free (b_content); - - return (cmp == 0); -} - -/* Determine if /etc/localtime is a copy of a timezone file */ -static char * -system_timezone_read_etc_localtime_content (void) -{ - struct stat stat_localtime; - char *localtime_content = NULL; - gsize localtime_content_len = -1; - char *retval; - - if (g_stat (ETC_LOCALTIME, &stat_localtime) != 0) - return NULL; - - if (!S_ISREG (stat_localtime.st_mode)) - return NULL; - - if (!g_file_get_contents (ETC_LOCALTIME, - &localtime_content, - &localtime_content_len, - NULL)) - return NULL; - - retval = recursive_compare (&stat_localtime, - localtime_content, - localtime_content_len, - SYSTEM_ZONEINFODIR, - files_are_identical_content); - - g_free (localtime_content); - - return retval; -} - -typedef char * (*GetSystemTimezone) (void); -/* The order of the functions here define the priority of the methods used - * to find the timezone. First method has higher priority. */ -static GetSystemTimezone get_system_timezone_methods[] = { - /* cheap and "more correct" than data from a config file */ - system_timezone_read_etc_localtime_softlink, - /* reading various config files */ - system_timezone_read_etc_timezone, - system_timezone_read_etc_sysconfig_clock, - system_timezone_read_etc_sysconfig_clock_alt, - system_timezone_read_etc_TIMEZONE, - system_timezone_read_etc_rc_conf, - /* reading deprecated config files */ - system_timezone_read_etc_conf_d_clock, - /* reading /etc/timezone directly. Expensive since we have to stat - * many files */ - system_timezone_read_etc_localtime_hardlink, - system_timezone_read_etc_localtime_content, - NULL -}; - -static gboolean -system_timezone_is_valid (const char *tz) -{ - const char *c; - - if (!tz) - return FALSE; - - for (c = tz; *c != '\0'; c++) { - if (!(g_ascii_isalnum (*c) || - *c == '/' || *c == '-' || *c == '_')) - return FALSE; - } - - return TRUE; -} - -char * -system_timezone_find (void) -{ - char *tz; - int i; - - for (i = 0; get_system_timezone_methods[i] != NULL; i++) { - tz = get_system_timezone_methods[i] (); - - if (system_timezone_is_valid (tz)) - return tz; - - g_free (tz); - } - - return g_strdup ("UTC"); -} - -/* - * - * Now, setting the timezone. - * - */ - -static gboolean -system_timezone_is_zone_file_valid (const char *zone_file, - GError **error) -{ - GError *our_error; - GIOChannel *channel; - char buffer[strlen (TZ_MAGIC)]; - gsize read; - - /* First, check the zone_file is properly rooted */ - if (!g_str_has_prefix (zone_file, SYSTEM_ZONEINFODIR"/")) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE, - "Timezone file needs to be under "SYSTEM_ZONEINFODIR); - return FALSE; - } - - /* Second, check it's a regular file that exists */ - if (!g_file_test (zone_file, G_FILE_TEST_IS_REGULAR)) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE, - "No such timezone file %s", zone_file); - return FALSE; - } - - /* Third, check that it's a tzfile (see tzfile(5)). The file has a 4 - * bytes header which is TZ_MAGIC. - * - * TODO: is there glibc API for this? */ - our_error = NULL; - channel = g_io_channel_new_file (zone_file, "r", &our_error); - if (!our_error) - g_io_channel_read_chars (channel, - buffer, strlen (TZ_MAGIC), - &read, &our_error); - if (channel) - g_io_channel_unref (channel); - - if (our_error) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE, - "Timezone file %s cannot be read: %s", - zone_file, our_error->message); - g_error_free (our_error); - return FALSE; - } - - if (read != strlen (TZ_MAGIC) || strncmp (buffer, TZ_MAGIC, strlen (TZ_MAGIC)) != 0) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE, - "%s is not a timezone file", - zone_file); - return FALSE; - } - - return TRUE; -} - -static gboolean -system_timezone_set_etc_timezone (const char *zone_file, - GError **error) -{ - GError *our_error; - char *content; - gsize len; - - if (!system_timezone_is_zone_file_valid (zone_file, error)) - return FALSE; - - /* If /etc/localtime is a symlink, write a symlink */ - if (g_file_test (ETC_LOCALTIME, G_FILE_TEST_IS_SYMLINK)) { - if (g_unlink (ETC_LOCALTIME) == 0 && - symlink (zone_file, ETC_LOCALTIME) == 0) - return TRUE; - - /* If we couldn't symlink the file, we'll just fallback on - * copying it */ - } - - /* Else copy the file to /etc/localtime. We explicitly avoid doing - * hard links since they break with different partitions */ - our_error = NULL; - if (!g_file_get_contents (zone_file, &content, &len, &our_error)) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_GENERAL, - "Timezone file %s cannot be read: %s", - zone_file, our_error->message); - g_error_free (our_error); - return FALSE; - } - - if (!g_file_set_contents (ETC_LOCALTIME, content, len, &our_error)) { - g_set_error (error, SYSTEM_TIMEZONE_ERROR, - SYSTEM_TIMEZONE_ERROR_GENERAL, - ETC_LOCALTIME" cannot be overwritten: %s", - our_error->message); - g_error_free (our_error); - g_free (content); - return FALSE; - } - - g_free (content); - - return TRUE; -} - -typedef gboolean (*SetSystemTimezone) (const char *tz, - GError **error); -/* The order here does not matter too much: we'll try to change all files - * that already have a timezone configured. It matters in case of error, - * since the process will be stopped and the last methods won't be called. - * So we use the same order as in get_system_timezone_methods */ -static SetSystemTimezone set_system_timezone_methods[] = { - /* writing various config files if they exist and have the - * setting already present */ - system_timezone_write_etc_timezone, - system_timezone_write_etc_sysconfig_clock, - system_timezone_write_etc_sysconfig_clock_alt, - system_timezone_write_etc_TIMEZONE, - system_timezone_write_etc_rc_conf, - /* writing deprecated config files if they exist and have the - * setting already present */ - system_timezone_write_etc_conf_d_clock, - NULL -}; - -static gboolean -system_timezone_update_config (const char *tz, - GError **error) -{ - int i; - - for (i = 0; set_system_timezone_methods[i] != NULL; i++) { - if (!set_system_timezone_methods[i] (tz, error)) - return FALSE; - /* FIXME: maybe continue to change all config files if - * possible? */ - } - - return TRUE; -} - -gboolean -system_timezone_set (const char *tz, - GError **error) -{ - char *zone_file; - gboolean retval; - - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - zone_file = g_build_filename (SYSTEM_ZONEINFODIR, tz, NULL); - - /* FIXME: is it right to return FALSE even when /etc/localtime was - * changed but not the config files? */ - retval = system_timezone_set_etc_timezone (zone_file, error) && - system_timezone_update_config (tz, error); - - g_free (zone_file); - - return retval; -} - -GQuark -system_timezone_error_quark (void) -{ - static GQuark ret = 0; - - if (ret == 0) { - ret = g_quark_from_static_string ("system-timezone-error"); - } - - return ret; -} diff --git a/plugins/datetime/system-timezone.h b/plugins/datetime/system-timezone.h deleted file mode 100644 index 176ca4d..0000000 --- a/plugins/datetime/system-timezone.h +++ /dev/null @@ -1,80 +0,0 @@ -/* System timezone handling - * - * Copyright (C) 2008 Novell, Inc. - * - * Authors: Vincent Untz <vuntz@gnome.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __SYSTEM_TIMEZONE_H__ -#define __SYSTEM_TIMEZONE_H__ - -#include <glib.h> -#include <glib-object.h> - -G_BEGIN_DECLS - -#ifdef HAVE_SOLARIS -#define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab" -#else -#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo" -#endif - - -#define SYSTEM_TIMEZONE_TYPE (system_timezone_get_type ()) -#define SYSTEM_TIMEZONE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SYSTEM_TIMEZONE_TYPE, SystemTimezone)) -#define SYSTEM_TIMEZONE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), SYSTEM_TIMEZONE_TYPE, SystemTimezoneClass)) -#define IS_SYSTEM_TIMEZONE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SYSTEM_TIMEZONE_TYPE)) -#define IS_SYSTEM_TIMEZONE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), SYSTEM_TIMEZONE_TYPE)) -#define SYSTEM_TIMEZONE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), SYSTEM_TIMEZONE_TYPE, SystemTimezoneClass)) - -typedef struct -{ - GObject g_object; -} SystemTimezone; - -typedef struct -{ - GObjectClass g_object_class; -} SystemTimezoneClass; - -GType system_timezone_get_type (void); - -SystemTimezone *system_timezone_new (void); - -const char *system_timezone_get (SystemTimezone *systz); -const char *system_timezone_get_env (SystemTimezone *systz); - -/* Functions to set the timezone. They won't be used by the applet, but - * by a program with more privileges */ - -#define SYSTEM_TIMEZONE_ERROR system_timezone_error_quark () -GQuark system_timezone_error_quark (void); - -typedef enum -{ - SYSTEM_TIMEZONE_ERROR_GENERAL, - SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE, - SYSTEM_TIMEZONE_NUM_ERRORS -} SystemTimezoneError; - -char *system_timezone_find (void); - -gboolean system_timezone_set (const char *tz, - GError **error); - -G_END_DECLS -#endif /* __SYSTEM_TIMEZONE_H__ */ diff --git a/plugins/datetime/test-system-timezone.c b/plugins/datetime/test-system-timezone.c deleted file mode 100644 index 19800d8..0000000 --- a/plugins/datetime/test-system-timezone.c +++ /dev/null @@ -1,93 +0,0 @@ -/* Test for system timezone handling - * - * Copyright (C) 2008-2010 Novell, Inc. - * - * Authors: Vincent Untz <vuntz@gnome.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - */ - -#include <glib.h> -#include "system-timezone.h" - -static void -timezone_print (void) -{ - SystemTimezone *systz; - - systz = system_timezone_new (); - g_print ("Current timezone: %s\n", system_timezone_get (systz)); - g_object_unref (systz); -} - -static int -timezone_set (const char *new_tz) -{ - GError *error; - - error = NULL; - if (!system_timezone_set (new_tz, &error)) { - g_printerr ("%s\n", error->message); - g_error_free (error); - return 1; - } - - return 0; -} - -int -main (int argc, - char **argv) -{ - int retval; - - gboolean get = FALSE; - char *tz_set = NULL; - - GError *error; - GOptionContext *context; - GOptionEntry options[] = { - { "get", 'g', 0, G_OPTION_ARG_NONE, &get, "Get the current timezone", NULL }, - { "set", 's', 0, G_OPTION_ARG_STRING, &tz_set, "Set the timezone to TIMEZONE", "TIMEZONE" }, - { NULL, 0, 0, 0, NULL, NULL, NULL } - }; - - retval = 0; - - g_type_init (); - - context = g_option_context_new (""); - g_option_context_add_main_entries (context, options, NULL); - - error = NULL; - if (!g_option_context_parse (context, &argc, &argv, &error)) { - g_printerr ("%s\n", error->message); - g_error_free (error); - g_option_context_free (context); - - return 1; - } - - g_option_context_free (context); - - if (get || (!tz_set)) - timezone_print (); - else if (tz_set) - retval = timezone_set (tz_set); - else - g_assert_not_reached (); - - return retval; -} |