From f1d47ee2d44e120c5f926aea92c37c1e6cccb0ec Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Fri, 26 Aug 2011 13:09:41 -0400 Subject: [PATCH] Revert "udisks: Avoid deprecated polkit_authority_get() function" This reverts commit 813578196f08c599c7e87c45aff808db0148303d. --- configure.ac | 4 ++-- src/daemon.c | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 77ebf7d..a9141bf 100644 --- a/configure.ac +++ b/configure.ac @@ -151,11 +151,11 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.82]) AC_SUBST(DBUS_GLIB_CFLAGS) AC_SUBST(DBUS_GLIB_LIBS) -PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.97]) +PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.92]) AC_SUBST(POLKIT_GOBJECT_1_CFLAGS) AC_SUBST(POLKIT_GOBJECT_1_LIBS) -PKG_CHECK_MODULES(POLKIT_BACKEND_1, [polkit-backend-1 >= 0.97]) +PKG_CHECK_MODULES(POLKIT_BACKEND_1, [polkit-backend-1 >= 0.92]) AC_SUBST(POLKIT_BACKEND_1_CFLAGS) AC_SUBST(POLKIT_BACKEND_1_LIBS) diff --git a/src/daemon.c b/src/daemon.c index afcd8fb..d46c6da 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -1794,16 +1794,7 @@ register_disks_daemon (Daemon *daemon) "sas_expander", /* SAS Expanders */ NULL }; - daemon->priv->authority = polkit_authority_get_sync ((GCancellable *) NULL, &error); - if (daemon->priv->authority == NULL) - { - if (error != NULL) - { - g_critical ("error getting authority reference: %s", error->message); - g_error_free (error); - } - goto error; - } + daemon->priv->authority = polkit_authority_get (); error = NULL; daemon->priv->system_bus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); -- 2.7.4