From 8bcea2de19cab57e0c340cf6d8ebf181c31529df Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 15 Dec 2012 03:09:58 +0200 Subject: [all] Silence build by default, and remove unneeded version requirements http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=b9b785508085d77818c76ab4aed8ee574dbd1756 --- plugins/datetime/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/datetime') diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am index 061443f..7c3b76a 100644 --- a/plugins/datetime/Makefile.am +++ b/plugins/datetime/Makefile.am @@ -6,7 +6,7 @@ dbus_services_in_files = org.mate.SettingsDaemon.DateTimeMechanism.service.in polkit_in_files = org.mate.settingsdaemon.datetimemechanism.policy.in msd-datetime-mechanism-glue.h: $(srcdir)/msd-datetime-mechanism.xml - $(AM_V_GEN)dbus-binding-tool \ + $(AM_V_GEN) dbus-binding-tool \ --prefix=msd_datetime_mechanism --mode=glib-server \ --output=msd-datetime-mechanism-glue.h \ $(srcdir)/msd-datetime-mechanism.xml -- cgit v1.2.1 From 89f1a9bd93f75f2b3cd23667654d0351d86b13eb Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 15 Dec 2012 03:13:18 +0200 Subject: [datetime] fix deprecated polkit_authority_get(), bump to 0.97 http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=d08b1b05997b3591c7ac1eefebd04a503c97c06e and bump PolicyKit minimum required to 0.97 http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=d1c499e9e6b2aae3b0d1e0004e38f1d280e31144 --- plugins/datetime/msd-datetime-mechanism.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'plugins/datetime') diff --git a/plugins/datetime/msd-datetime-mechanism.c b/plugins/datetime/msd-datetime-mechanism.c index f03018f..6fc3399 100644 --- a/plugins/datetime/msd-datetime-mechanism.c +++ b/plugins/datetime/msd-datetime-mechanism.c @@ -176,9 +176,15 @@ register_mechanism (MsdDatetimeMechanism *mechanism) { GError *error = NULL; - mechanism->priv->auth = polkit_authority_get (); + 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; + } - error = NULL; mechanism->priv->system_bus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); if (mechanism->priv->system_bus_connection == NULL) { if (error != NULL) { -- cgit v1.2.1