PolicyKit: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Sun Feb 8 08:18:56 PST 2009
docs/polkit/Makefile.am | 2
docs/polkit/polkit-docs.xml | 2
src/polkit/Makefile.am | 30 +++++++------
src/polkitagent/Makefile.am | 19 --------
src/polkitagent/polkitagentlistener.c | 29 ++++++-------
src/polkitbackend/Makefile.am | 21 +--------
src/polkitbackend/polkitbackendlocalauthority.c | 53 +++++++++++-------------
7 files changed, 64 insertions(+), 92 deletions(-)
New commits:
commit 21cdbad09bd3f9790c5e57ddfecbd0ef538b9c2c
Author: David Zeuthen <davidz at redhat.com>
Date: Sun Feb 8 11:17:04 2009 -0500
generate all polkit dbus code in one place
diff --git a/docs/polkit/Makefile.am b/docs/polkit/Makefile.am
index bf4f909..da1eb7f 100644
--- a/docs/polkit/Makefile.am
+++ b/docs/polkit/Makefile.am
@@ -51,7 +51,7 @@ content_files = \
../version.xml \
../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.Authority.xml \
../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.AuthorityManager.xml \
- ../../src/polkitagent/docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml \
+ ../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml \
../man/PolicyKit.xml \
../man/polkit.xml \
$(NULL)
diff --git a/docs/polkit/polkit-docs.xml b/docs/polkit/polkit-docs.xml
index 07f118f..5cdb817 100644
--- a/docs/polkit/polkit-docs.xml
+++ b/docs/polkit/polkit-docs.xml
@@ -59,7 +59,7 @@
<title>D-Bus API Reference</title>
<xi:include href="../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.Authority.xml"/>
<xi:include href="../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.AuthorityManager.xml"/>
- <xi:include href="../../src/polkitagent/docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml"/>
+ <xi:include href="../../src/polkit/docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml"/>
</reference>
<reference id="ref-api">
diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index 1345d9d..7bd8acf 100644
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -16,21 +16,25 @@ INCLUDES = \
$(NULL)
BUILT_SOURCES = \
- authority-built-sources.stamp \
+ polkit-built-sources.stamp \
$(NULL)
-authority-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
- eggdbus-binding-tool \
- --namespace "_Polkit" \
- --dbus-namespace "org.freedesktop.PolicyKit1" \
- --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml \
- --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthorityManager.xml \
- --stamp-file authority-built-sources.stamp \
+# Build all the PolicyKit D-Bus code here, even the code we
+# only in the daemon for agent interaction
+#
+polkit-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
+ eggdbus-binding-tool \
+ --namespace "_Polkit" \
+ --dbus-namespace "org.freedesktop.PolicyKit1" \
+ --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml \
+ --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthorityManager.xml \
+ --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml \
+ --stamp-file polkit-built-sources.stamp \
$(NULL)
-# keep in sync with contents of authority-built-sources.stamp (Thanks autotools)
+# keep in sync with contents of polkit-built-sources.stamp (Thanks autotools)
#
-authority_built_sources = _polkitbindingsmarshal.c _polkitbindingsmarshal.h _polkitbindingsmarshal.list _polkitbindings.c _polkitbindings.h _polkitbindingstypes.h _polkitauthoritymanager.c _polkitauthoritymanager.h docbook-interface-org.freedesktop.PolicyKit1.AuthorityManager.xml _polkitauthority.c _polkitauthority.h docbook-interface-org.freedesktop.PolicyKit1.Authority.xml _polkitcheckauthorizationflags.c _polkitcheckauthorizationflags.h _polkitauthorizationresult.c _polkitauthorizationresult.h _polkiterror.c _polkiterror.h _polkitimplicitauthorization.c _polkitimplicitauthorization.h _polkitauthorization.c _polkitauthorization.h _polkitactiondescription.c _polkitactiondescription.h _polkitidentity.c _polkitidentity.h _polkitsubject.c _polkitsubject.h
+polkit_built_sources = _polkitbindingsmarshal.c _polkitbindingsmarshal.h _polkitbindingsmarshal.list _polkitbindings.c _polkitbindings.h _polkitbindingstypes.h _polkitauthenticationagent.c _polkitauthenticationagent.h docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml _polkitauthoritymanager.c _polkitauthoritymanager.h docbook-interface-org.freedesktop.PolicyKit1.AuthorityManager.xml _polkitauthority.c _polkitauthority.h docbook-interface-org.freedesktop.PolicyKit1.Authority.xml _polkiterror.c _polkiterror.h _polkitimplicitauthorization.c _polkitimplicitauthorization.h _polkitauthorizationresult.c _polkitauthorizationresult.h _polkitcheckauthorizationflags.c _polkitcheckauthorizationflags.h _polkitauthorization.c _polkitauthorization.h _polkitactiondescription.c _polkitactiondescription.h _polkitidentity.c _polkitidentity.h _polkitsubject.c _polkitsubject.h
lib_LTLIBRARIES=libpolkit-gobject-1.la
@@ -59,7 +63,7 @@ libpolkit_gobject_1include_HEADERS = \
libpolkit_gobject_1_la_SOURCES = \
$(BUILT_SOURCES) \
- $(authority_built_sources) \
+ $(polkit_built_sources) \
polkit.h \
polkitactiondescription.c polkitactiondescription.h \
polkitauthority.c polkitauthority.h \
@@ -90,8 +94,8 @@ libpolkit_gobject_1_la_LIBADD = \
$(NULL)
dist-hook :
- (for i in $(authority_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
+ (for i in $(polkit_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
clean-local :
- rm -f *~ $(authority_built_sources) $(BUILT_SOURCES)
+ rm -f *~ $(polkit_built_sources) $(BUILT_SOURCES)
diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
index 2c8d670..cec4c24 100644
--- a/src/polkitagent/Makefile.am
+++ b/src/polkitagent/Makefile.am
@@ -18,22 +18,8 @@ INCLUDES = \
BUILT_SOURCES = \
marshal.stamp \
- agent-built-sources.stamp \
$(NULL)
-agent-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
- eggdbus-binding-tool \
- --namespace "_PolkitAgent" \
- --dbus-namespace "org.freedesktop.PolicyKit1" \
- --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml \
- --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml \
- --stamp-file agent-built-sources.stamp \
- $(NULL)
-
-# keep in sync with contents of agent-built-sources.stamp (Thanks autotools)
-#
-agent_built_sources = _polkitagentbindingsmarshal.c _polkitagentbindingsmarshal.h _polkitagentbindingsmarshal.list _polkitagentbindings.c _polkitagentbindings.h _polkitagentbindingstypes.h _polkitagentauthenticationagent.c _polkitagentauthenticationagent.h docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml _polkitagentauthority.c _polkitagentauthority.h docbook-interface-org.freedesktop.PolicyKit1.Authority.xml _polkitagentcheckauthorizationflags.c _polkitagentcheckauthorizationflags.h _polkitagentauthorizationresult.c _polkitagentauthorizationresult.h _polkitagenterror.c _polkitagenterror.h _polkitagentimplicitauthorization.c _polkitagentimplicitauthorization.h _polkitagentactiondescription.c _polkitagentactiondescription.h _polkitagentidentity.c _polkitagentidentity.h _polkitagentsubject.c _polkitagentsubject.h
-
marshal.stamp : Makefile.am $(srcdir)/polkitagentmarshal.list
glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h
(echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c
@@ -54,7 +40,6 @@ libpolkit_agent_1include_HEADERS = \
libpolkit_agent_1_la_SOURCES = \
$(BUILT_SOURCES) \
- $(agent_built_sources) \
$(marshal_built_sources) \
polkitagent.h \
polkitagenttypes.h \
@@ -91,7 +76,7 @@ install-exec-hook:
EXTRA_DIST = polkitagentmarshal.list
dist-hook :
- (for i in $(agent_built_sources) $(marshal_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
+ (for i in $(marshal_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
clean-local :
- rm -f *~ $(agent_built_sources) $(marshal_built_sources) $(BUILT_SOURCES)
+ rm -f *~ $(marshal_built_sources) $(BUILT_SOURCES)
diff --git a/src/polkitagent/polkitagentlistener.c b/src/polkitagent/polkitagentlistener.c
index c1c6771..cf20f28 100644
--- a/src/polkitagent/polkitagentlistener.c
+++ b/src/polkitagent/polkitagentlistener.c
@@ -22,7 +22,6 @@
#include "config.h"
#include <polkit/polkitprivate.h>
-#include "_polkitagentbindings.h"
#include "polkitagentlistener.h"
@@ -86,10 +85,10 @@ struct _ServerClass
static GType server_get_type (void) G_GNUC_CONST;
-static void authentication_agent_iface_init (_PolkitAgentAuthenticationAgentIface *agent_iface);
+static void authentication_agent_iface_init (_PolkitAuthenticationAgentIface *agent_iface);
G_DEFINE_TYPE_WITH_CODE (Server, server, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (_POLKIT_AGENT_TYPE_AUTHENTICATION_AGENT,
+ G_IMPLEMENT_INTERFACE (_POLKIT_TYPE_AUTHENTICATION_AGENT,
authentication_agent_iface_init)
);
@@ -278,7 +277,7 @@ polkit_agent_register_listener (PolkitAgentListener *listener,
egg_dbus_connection_register_interface (server->system_bus,
server->object_path,
- _POLKIT_AGENT_TYPE_AUTHENTICATION_AGENT,
+ _POLKIT_TYPE_AUTHENTICATION_AGENT,
G_OBJECT (server),
G_TYPE_INVALID);
@@ -347,7 +346,7 @@ auth_cb (GObject *source_object,
}
else
{
- _polkit_agent_authentication_agent_handle_begin_authentication_finish (data->method_invocation);
+ _polkit_authentication_agent_handle_begin_authentication_finish (data->method_invocation);
}
g_hash_table_remove (data->server->cookie_to_pending_auth, data->cookie);
@@ -356,11 +355,11 @@ auth_cb (GObject *source_object,
}
static void
-handle_begin_authentication (_PolkitAgentAuthenticationAgent *instance,
- const gchar *action_id,
- const gchar *cookie,
- EggDBusArraySeq *identities,
- EggDBusMethodInvocation *method_invocation)
+handle_begin_authentication (_PolkitAuthenticationAgent *instance,
+ const gchar *action_id,
+ const gchar *cookie,
+ EggDBusArraySeq *identities,
+ EggDBusMethodInvocation *method_invocation)
{
Server *server = SERVER (instance);
AuthData *data;
@@ -399,9 +398,9 @@ handle_begin_authentication (_PolkitAgentAuthenticationAgent *instance,
}
static void
-handle_cancel_authentication (_PolkitAgentAuthenticationAgent *instance,
- const gchar *cookie,
- EggDBusMethodInvocation *method_invocation)
+handle_cancel_authentication (_PolkitAuthenticationAgent *instance,
+ const gchar *cookie,
+ EggDBusMethodInvocation *method_invocation)
{
Server *server = SERVER (instance);
AuthData *data;
@@ -418,12 +417,12 @@ handle_cancel_authentication (_PolkitAgentAuthenticationAgent *instance,
else
{
g_cancellable_cancel (data->cancellable);
- _polkit_agent_authentication_agent_handle_cancel_authentication_finish (method_invocation);
+ _polkit_authentication_agent_handle_cancel_authentication_finish (method_invocation);
}
}
static void
-authentication_agent_iface_init (_PolkitAgentAuthenticationAgentIface *agent_iface)
+authentication_agent_iface_init (_PolkitAuthenticationAgentIface *agent_iface)
{
agent_iface->handle_begin_authentication = handle_begin_authentication;
agent_iface->handle_cancel_authentication = handle_cancel_authentication;
diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
index 3dcb030..5f10f9e 100644
--- a/src/polkitbackend/Makefile.am
+++ b/src/polkitbackend/Makefile.am
@@ -16,7 +16,6 @@ INCLUDES = \
$(NULL)
BUILT_SOURCES = \
- agent-built-sources.stamp \
ck-built-sources.stamp \
$(NULL)
@@ -28,22 +27,9 @@ ck-built-sources.stamp : Makefile.am $(srcdir)/org.freedesktop.ConsoleKit.xml
--stamp-file ck-built-sources.stamp \
$(NULL)
-agent-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
- eggdbus-binding-tool \
- --namespace "_PolkitAgent" \
- --dbus-namespace "org.freedesktop.PolicyKit1" \
- --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.Authority.xml \
- --introspection-xml $(top_srcdir)/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml \
- --stamp-file agent-built-sources.stamp \
- $(NULL)
-
# keep in sync with contents of ck-built-sources.stamp (Thanks autotools)
#
-ck_built_sources = ckbindingsmarshal.c ckbindingsmarshal.h ckbindingsmarshal.list ckbindings.c ckbindings.h ckbindingstypes.h cksession.c cksession.h docbook-interface-org.freedesktop.ConsoleKit.Session.xml ckseat.c ckseat.h docbook-interface-org.freedesktop.ConsoleKit.Seat.xml ckmanager.c ckmanager.h docbook-interface-org.freedesktop.ConsoleKit.Manager.xml ckerror.c ckerror.h ckdevice.c ckdevice.h
-
-# keep in sync with contents of agent-built-sources.stamp (Thanks autotools)
-#
-agent_built_sources = _polkitagentbindingsmarshal.c _polkitagentbindingsmarshal.h _polkitagentbindingsmarshal.list _polkitagentbindings.c _polkitagentbindings.h _polkitagentbindingstypes.h _polkitagentauthenticationagent.c _polkitagentauthenticationagent.h docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml _polkitagentauthority.c _polkitagentauthority.h docbook-interface-org.freedesktop.PolicyKit1.Authority.xml _polkitagenterror.c _polkitagenterror.h _polkitagentimplicitauthorization.c _polkitagentimplicitauthorization.h _polkitagentauthorizationresult.c _polkitagentauthorizationresult.h _polkitagentcheckauthorizationflags.c _polkitagentcheckauthorizationflags.h _polkitagentactiondescription.c _polkitagentactiondescription.h _polkitagentidentity.c _polkitagentidentity.h _polkitagentsubject.c _polkitagentsubject.h
+ck_built_sources = ckbindingsmarshal.c ckbindingsmarshal.h ckbindingsmarshal.list ckbindings.c ckbindings.h ckbindingstypes.h cksession.c cksession.h docbook-interface-org.freedesktop.ConsoleKit.Session.xml ckseat.c ckseat.h docbook-interface-org.freedesktop.ConsoleKit.Seat.xml ckmanager.c ckmanager.h docbook-interface-org.freedesktop.ConsoleKit.Manager.xml ckerror.c ckerror.h docbook-enum-Error.xml ckdevice.c ckdevice.h docbook-struct-Device.xml
lib_LTLIBRARIES=libpolkit-backend-1.la
@@ -60,7 +46,6 @@ libpolkit_backend_1include_HEADERS = \
libpolkit_backend_1_la_SOURCES = \
$(ck_built_sources) \
- $(agent_built_sources) \
$(BUILT_SOURCES) \
polkitbackend.h \
polkitbackendtypes.h \
@@ -91,10 +76,10 @@ EXTRA_DIST = \
$(NULL)
dist-hook :
- (for i in $(ck_built_sources) $(agent_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
+ (for i in $(ck_built_sources) $(BUILT_SOURCES) ; do rm -f $(distdir)/$$i ; done)
clean-local :
- rm -f *~ $(ck_built_sources) $(agent_built_sources) $(BUILT_SOURCES)
+ rm -f *~ $(ck_built_sources) $(BUILT_SOURCES)
install-exec-hook:
mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1
diff --git a/src/polkitbackend/polkitbackendlocalauthority.c b/src/polkitbackend/polkitbackendlocalauthority.c
index 4a23ea5..e5b3027 100644
--- a/src/polkitbackend/polkitbackendlocalauthority.c
+++ b/src/polkitbackend/polkitbackendlocalauthority.c
@@ -31,7 +31,6 @@
#include "polkitbackendactionpool.h"
#include "polkitbackendsessionmonitor.h"
-#include "_polkitagentbindings.h"
#include <polkit/polkitprivate.h>
/**
@@ -1294,15 +1293,15 @@ authentication_agent_begin_callback (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
- _PolkitAgentAuthenticationAgent *agent_dbus = _POLKIT_AGENT_AUTHENTICATION_AGENT (source_object);
+ _PolkitAuthenticationAgent *agent_dbus = _POLKIT_AUTHENTICATION_AGENT (source_object);
AuthenticationSession *session = user_data;
GError *error;
gboolean gained_authorization;
error = NULL;
- if (!_polkit_agent_authentication_agent_begin_authentication_finish (agent_dbus,
- res,
- &error))
+ if (!_polkit_authentication_agent_begin_authentication_finish (agent_dbus,
+ res,
+ &error))
{
g_warning ("Error performing authentication: %s", error->message);
g_error_free (error);
@@ -1342,7 +1341,7 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent,
gpointer user_data)
{
AuthenticationSession *session;
- _PolkitAgentAuthenticationAgent *agent_dbus;
+ _PolkitAuthenticationAgent *agent_dbus;
gchar *cookie;
GList *l;
GList *identities;
@@ -1373,7 +1372,7 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent,
agent->active_sessions = g_list_prepend (agent->active_sessions, session);
- agent_dbus = _POLKIT_AGENT_QUERY_INTERFACE_AUTHENTICATION_AGENT (agent->object_proxy);
+ agent_dbus = _POLKIT_QUERY_INTERFACE_AUTHENTICATION_AGENT (agent->object_proxy);
real_identities = egg_dbus_array_seq_new (EGG_DBUS_TYPE_STRUCTURE, g_object_unref, NULL, NULL);
for (l = identities; l != NULL; l = l->next)
@@ -1382,14 +1381,14 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent,
egg_dbus_array_seq_add (real_identities, polkit_identity_get_real (identity));
}
- session->call_id = _polkit_agent_authentication_agent_begin_authentication (agent_dbus,
- EGG_DBUS_CALL_FLAGS_NONE,
- action_id,
- session->cookie,
- real_identities,
- NULL,
- authentication_agent_begin_callback,
- session);
+ session->call_id = _polkit_authentication_agent_begin_authentication (agent_dbus,
+ EGG_DBUS_CALL_FLAGS_NONE,
+ action_id,
+ session->cookie,
+ real_identities,
+ NULL,
+ authentication_agent_begin_callback,
+ session);
g_list_foreach (identities, (GFunc) g_object_unref, NULL);
g_list_free (identities);
@@ -1402,29 +1401,29 @@ authentication_agent_cancel_callback (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
- _PolkitAgentAuthenticationAgent *agent_dbus = _POLKIT_AGENT_AUTHENTICATION_AGENT (source_object);
+ _PolkitAuthenticationAgent *agent_dbus = _POLKIT_AUTHENTICATION_AGENT (source_object);
- _polkit_agent_authentication_agent_cancel_authentication_finish (agent_dbus,
- res,
- NULL);
+ _polkit_authentication_agent_cancel_authentication_finish (agent_dbus,
+ res,
+ NULL);
}
static void
authentication_session_cancel (AuthenticationSession *session)
{
EggDBusConnection *system_bus;
- _PolkitAgentAuthenticationAgent *agent_dbus;
+ _PolkitAuthenticationAgent *agent_dbus;
system_bus = egg_dbus_connection_get_for_bus (EGG_DBUS_BUS_TYPE_SYSTEM);
- agent_dbus = _POLKIT_AGENT_QUERY_INTERFACE_AUTHENTICATION_AGENT (session->agent->object_proxy);
+ agent_dbus = _POLKIT_QUERY_INTERFACE_AUTHENTICATION_AGENT (session->agent->object_proxy);
- _polkit_agent_authentication_agent_cancel_authentication (agent_dbus,
- EGG_DBUS_CALL_FLAGS_NONE,
- session->cookie,
- NULL,
- authentication_agent_cancel_callback,
- NULL);
+ _polkit_authentication_agent_cancel_authentication (agent_dbus,
+ EGG_DBUS_CALL_FLAGS_NONE,
+ session->cookie,
+ NULL,
+ authentication_agent_cancel_callback,
+ NULL);
egg_dbus_connection_pending_call_cancel (system_bus, session->call_id);
More information about the hal-commit
mailing list