Polkit moved to Utils (can be used both in daemon and plugins)

3 files changed, 3 insertions, 107 deletions

diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index 498223c2..f6bb9c15 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -13,8 +13,7 @@ abrtd_SOURCES = \
     CommLayerServerSocket.h CommLayerServerSocket.cpp \
     CommLayerServerDBus.h CommLayerServerDBus.cpp \
     Daemon.cpp Daemon.h \
-    Settings.h Settings.cpp \
-    Polkit.h Polkit.cpp
+    Settings.h Settings.cpp
 abrtd_CPPFLAGS = \
     -I$(srcdir)/../../inc \
     -I$(srcdir)/../../lib/MiddleWare \
@@ -26,11 +25,11 @@ abrtd_CPPFLAGS = \
     -DCONF_DIR=\"$(CONF_DIR)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-    $(ENABLE_SOCKET_OR_DBUS) $(POLKIT_CFLAGS)
+    $(ENABLE_SOCKET_OR_DBUS)
 abrtd_LDADD = \
     ../../lib/MiddleWare/libABRTMiddleWare.la \
     ../../lib/CommLayer/libABRTCommLayer.la \
-    $(DL_LIBS) $(DBUS_LIBS) $(RPM_LIBS) $(POLKIT_LIBS)
+    $(DL_LIBS) $(DBUS_LIBS) $(RPM_LIBS)
 
 dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
 dist_dbusabrtconf_DATA = dbus-abrt.conf
diff --git a/src/Daemon/Polkit.cpp b/src/Daemon/Polkit.cpp
deleted file mode 100644
index 8d533696..00000000
--- a/src/Daemon/Polkit.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    Polkit.cpp - PolicyKit integration for ABRT
- 
-    Copyright (C) 2009  Daniel Novotny (dnovotny@redhat.com) 
-    Copyright (C) 2009  RedHat inc. 
- 
-    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., 
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
-*/
-
-#include <polkit/polkit.h>
-#include <glib-object.h>
-
-#include "Polkit.h"
-
-PolkitResult polkit_check_authorization(const char *dbus_name, const char *action_id)
-{
-    PolkitAuthority *authority;
-    PolkitSubject *subject;
-    PolkitAuthorizationResult *result;
-    GError *error = NULL;
-
-    g_type_init();
-    authority = polkit_authority_get();
-    subject = polkit_system_bus_name_new(dbus_name);
-
-    result = polkit_authority_check_authorization_sync(authority,
-                subject,
-                action_id,
-                NULL,
-                POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
-                NULL,
-                &error);
-
-    if (error)
-    {
-        g_error_free(error);
-        return PolkitUnknown;
-    }
-
-    if (result)
-    {
-	if (polkit_authorization_result_get_is_challenge(result))
-            /* Can't happen (happens only with
-             * POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE flag) */
-	    return PolkitChallenge;
-    	if (polkit_authorization_result_get_is_authorized(result))
-	    return PolkitYes;
-	return PolkitNo;
-    }
-
-    return PolkitUnknown;
-}
diff --git a/src/Daemon/Polkit.h b/src/Daemon/Polkit.h
deleted file mode 100644
index a1e54f53..00000000
--- a/src/Daemon/Polkit.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-    Polkit.h - header file for PolicyKit integration
-
-    Copyright (C) 2009  Daniel Novotny (dnovotny@redhat.com)
-    Copyright (C) 2009  RedHat inc.
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef ABRT_POLKIT_H
-#define ABRT_POLKIT_H
-
-typedef enum {
-/* Authorization status is unknown */
-    PolkitUnknown = 0x0,
-    /* Subject is authorized for the action */
-    PolkitYes = 0x01,
-    /* Subject is not authorized for the action */
-    PolkitNo = 0x02,
-    /* Challenge is needed for this action, only when flag is
-     * POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE */
-    PolkitChallenge = 0x03
-} PolkitResult;
-
-PolkitResult polkit_check_authorization(const char *dbus_name, const char *action_id);
-
-#endif