PolicyKit: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Mon Aug 9 10:52:31 PDT 2010
docs/polkit/polkit-1-docs.xml | 4
docs/polkit/polkit-1-sections.txt | 72 ---------------
src/nullbackend/Makefile.am | 1
src/nullbackend/polkitbackendnullauthority.c | 1
src/polkitbackend/Makefile.am | 4
src/polkitbackend/polkitbackend.h | 4
src/polkitbackend/polkitbackendactionpool.h | 4
src/polkitbackend/polkitbackendconfigsource.h | 5 -
src/polkitbackend/polkitbackendlocalauthorizationstore.h | 5 -
src/polkitbackend/polkitbackendprivate.h | 4
src/polkitbackend/polkitbackendsessionmonitor.h | 6 -
src/polkitbackend/polkitbackendtypes.h | 9 -
12 files changed, 16 insertions(+), 103 deletions(-)
New commits:
commit 7d5eff96c830a9fbd23bd5ef2067d02769fee21b
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Aug 9 13:50:33 2010 -0400
PolkitBackend: Don't export unneeded convenience API
No need to export these classes
PolkitBackendActionPool
PolkitBackendSessionMonitor
PolkitBackendConfigSource
PolkitBackendLocalAuthorizationStore
since exporting them means we need to support their API and ABI
Signed-off-by: David Zeuthen <davidz at redhat.com>
diff --git a/docs/polkit/polkit-1-docs.xml b/docs/polkit/polkit-1-docs.xml
index 12a1af9..19c228a 100644
--- a/docs/polkit/polkit-1-docs.xml
+++ b/docs/polkit/polkit-1-docs.xml
@@ -94,10 +94,6 @@
<xi:include href="xml/polkitbackendauthority.xml"/>
<xi:include href="xml/polkitbackendinteractiveauthority.xml"/>
<xi:include href="xml/polkitbackendlocalauthority.xml"/>
- <xi:include href="xml/polkitbackendlocalauthorizationstore.xml"/>
- <xi:include href="xml/polkitbackendactionpool.xml"/>
- <xi:include href="xml/polkitbackendsessionmonitor.xml"/>
- <xi:include href="xml/polkitbackendconfigsource.xml"/>
<xi:include href="xml/polkitbackendactionlookup.xml"/>
</part>
diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt
index c8cb971..ef72acb 100644
--- a/docs/polkit/polkit-1-sections.txt
+++ b/docs/polkit/polkit-1-sections.txt
@@ -328,23 +328,6 @@ POLKIT_BACKEND_LOCAL_AUTHORITY_GET_CLASS
</SECTION>
<SECTION>
-<FILE>polkitbackendlocalauthorizationstore</FILE>
-<TITLE>PolkitBackendLocalAuthorizationStore</TITLE>
-PolkitBackendLocalAuthorizationStore
-PolkitBackendLocalAuthorizationStoreClass
-polkit_backend_local_authorization_store_new
-polkit_backend_local_authorization_store_lookup
-<SUBSECTION Standard>
-POLKIT_BACKEND_LOCAL_AUTHORIZATION_STORE
-POLKIT_BACKEND_IS_LOCAL_AUTHORIZATION_STORE
-POLKIT_BACKEND_TYPE_LOCAL_AUTHORIZATION_STORE
-polkit_backend_local_authorization_store_get_type
-POLKIT_BACKEND_LOCAL_AUTHORIZATION_STORE_CLASS
-POLKIT_BACKEND_IS_LOCAL_AUTHORIZATION_STORE_CLASS
-POLKIT_BACKEND_LOCAL_AUTHORIZATION_STORE_GET_CLASS
-</SECTION>
-
-<SECTION>
<FILE>polkitbackendinteractiveauthority</FILE>
<TITLE>PolkitBackendInteractiveAuthority</TITLE>
PolkitBackendInteractiveAuthority
@@ -362,61 +345,6 @@ POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS
</SECTION>
<SECTION>
-<FILE>polkitbackendactionpool</FILE>
-<TITLE>PolkitBackendActionPool</TITLE>
-PolkitBackendActionPool
-polkit_backend_action_pool_new
-polkit_backend_action_pool_get_all_actions
-polkit_backend_action_pool_get_action
-<SUBSECTION Standard>
-POLKIT_BACKEND_ACTION_POOL
-POLKIT_BACKEND_IS_ACTION_POOL
-POLKIT_BACKEND_TYPE_ACTION_POOL
-polkit_backend_action_pool_get_type
-POLKIT_BACKEND_ACTION_POOL_CLASS
-POLKIT_BACKEND_IS_ACTION_POOL_CLASS
-POLKIT_BACKEND_ACTION_POOL_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>polkitbackendsessionmonitor</FILE>
-PolkitBackendSessionMonitor
-polkit_backend_session_monitor_new
-polkit_backend_session_monitor_get_sessions
-polkit_backend_session_monitor_get_user_for_subject
-polkit_backend_session_monitor_get_session_for_subject
-polkit_backend_session_monitor_is_session_local
-polkit_backend_session_monitor_is_session_active
-<SUBSECTION Standard>
-POLKIT_BACKEND_SESSION_MONITOR
-POLKIT_BACKEND_IS_SESSION_MONITOR
-POLKIT_BACKEND_TYPE_SESSION_MONITOR
-polkit_backend_session_monitor_get_type
-POLKIT_BACKEND_SESSION_MONITOR_CLASS
-POLKIT_BACKEND_IS_SESSION_MONITOR_CLASS
-POLKIT_BACKEND_SESSION_MONITOR_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>polkitbackendconfigsource</FILE>
-PolkitBackendConfigSource
-polkit_backend_config_source_new
-polkit_backend_config_source_get_integer
-polkit_backend_config_source_get_boolean
-polkit_backend_config_source_get_double
-polkit_backend_config_source_get_string
-polkit_backend_config_source_get_string_list
-<SUBSECTION Standard>
-POLKIT_BACKEND_CONFIG_SOURCE
-POLKIT_BACKEND_IS_CONFIG_SOURCE
-POLKIT_BACKEND_TYPE_CONFIG_SOURCE
-polkit_backend_config_source_get_type
-POLKIT_BACKEND_CONFIG_SOURCE_CLASS
-POLKIT_BACKEND_IS_CONFIG_SOURCE_CLASS
-POLKIT_BACKEND_CONFIG_SOURCE_GET_CLASS
-</SECTION>
-
-<SECTION>
<FILE>polkitagentsession</FILE>
<TITLE>PolkitAgentSession</TITLE>
PolkitAgentSession
diff --git a/src/nullbackend/Makefile.am b/src/nullbackend/Makefile.am
index df4a838..c683818 100644
--- a/src/nullbackend/Makefile.am
+++ b/src/nullbackend/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES = \
-DPACKAGE_LIB_DIR=\""$(libdir)"\" \
-D_POSIX_PTHREAD_SEMANTICS \
-D_REENTRANT \
+ -D_POLKIT_BACKEND_COMPILATION \
$(NULL)
polkitmodulesdir = $(libdir)/polkit-1/extensions
diff --git a/src/nullbackend/polkitbackendnullauthority.c b/src/nullbackend/polkitbackendnullauthority.c
index 9451b14..6e969a0 100644
--- a/src/nullbackend/polkitbackendnullauthority.c
+++ b/src/nullbackend/polkitbackendnullauthority.c
@@ -26,6 +26,7 @@
#include <string.h>
#include <glib/gstdio.h>
+#include "polkitbackend/polkitbackendconfigsource.h"
#include "polkitbackendnullauthority.h"
struct _PolkitBackendNullAuthorityPrivate
diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
index 2d3f487..2030ad3 100644
--- a/src/polkitbackend/Makefile.am
+++ b/src/polkitbackend/Makefile.am
@@ -26,11 +26,7 @@ libpolkit_backend_1include_HEADERS = \
polkitbackendauthority.h \
polkitbackendinteractiveauthority.h \
polkitbackendlocalauthority.h \
- polkitbackendactionpool.h \
- polkitbackendsessionmonitor.h \
- polkitbackendconfigsource.h \
polkitbackendactionlookup.h \
- polkitbackendlocalauthorizationstore.h \
$(NULL)
libpolkit_backend_1_la_SOURCES = \
diff --git a/src/polkitbackend/polkitbackend.h b/src/polkitbackend/polkitbackend.h
index 44b5176..8eed99d 100644
--- a/src/polkitbackend/polkitbackend.h
+++ b/src/polkitbackend/polkitbackend.h
@@ -33,11 +33,7 @@
#include <polkitbackend/polkitbackendauthority.h>
#include <polkitbackend/polkitbackendinteractiveauthority.h>
#include <polkitbackend/polkitbackendlocalauthority.h>
-#include <polkitbackend/polkitbackendactionpool.h>
-#include <polkitbackend/polkitbackendsessionmonitor.h>
-#include <polkitbackend/polkitbackendconfigsource.h>
#include <polkitbackend/polkitbackendactionlookup.h>
-#include <polkitbackend/polkitbackendlocalauthorizationstore.h>
#undef _POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H
#endif /* __POLKIT_BACKEND_H */
diff --git a/src/polkitbackend/polkitbackendactionpool.h b/src/polkitbackend/polkitbackendactionpool.h
index ace9151..e992eea 100644
--- a/src/polkitbackend/polkitbackendactionpool.h
+++ b/src/polkitbackend/polkitbackendactionpool.h
@@ -19,8 +19,8 @@
* Author: David Zeuthen <davidz at redhat.com>
*/
-#if !defined (_POLKIT_BACKEND_COMPILATION) && !defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
-#error "Only <polkitbackend/polkitbackend.h> can be included directly, this file may disappear or change contents."
+#if !defined (_POLKIT_BACKEND_COMPILATION) || defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
+#error "This is a private header file."
#endif
#include <glib-object.h>
diff --git a/src/polkitbackend/polkitbackendconfigsource.h b/src/polkitbackend/polkitbackendconfigsource.h
index f83a377..f9a48c8 100644
--- a/src/polkitbackend/polkitbackendconfigsource.h
+++ b/src/polkitbackend/polkitbackendconfigsource.h
@@ -19,8 +19,8 @@
* Author: David Zeuthen <davidz at redhat.com>
*/
-#if !defined (_POLKIT_BACKEND_COMPILATION) && !defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
-#error "Only <polkitbackend/polkitbackend.h> can be included directly, this file may disappear or change contents."
+#if !defined (_POLKIT_BACKEND_COMPILATION) || defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
+#error "This is a private header file."
#endif
#ifndef __POLKIT_BACKEND_CONFIG_SOURCE_H
@@ -39,6 +39,7 @@ G_BEGIN_DECLS
#define POLKIT_BACKEND_IS_CONFIG_SOURCE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), POLKIT_BACKEND_TYPE_CONFIG_SOURCE))
#define POLKIT_BACKEND_IS_CONFIG_SOURCE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), POLKIT_BACKEND_TYPE_CONFIG_SOURCE))
+typedef struct _PolkitBackendConfigSource PolkitBackendConfigSource;
typedef struct _PolkitBackendConfigSourceClass PolkitBackendConfigSourceClass;
typedef struct _PolkitBackendConfigSourcePrivate PolkitBackendConfigSourcePrivate;
diff --git a/src/polkitbackend/polkitbackendlocalauthorizationstore.h b/src/polkitbackend/polkitbackendlocalauthorizationstore.h
index 865bf22..c15d9a6 100644
--- a/src/polkitbackend/polkitbackendlocalauthorizationstore.h
+++ b/src/polkitbackend/polkitbackendlocalauthorizationstore.h
@@ -19,8 +19,8 @@
* Author: David Zeuthen <davidz at redhat.com>
*/
-#if !defined (_POLKIT_BACKEND_COMPILATION) && !defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
-#error "Only <polkitbackend/polkitbackend.h> can be included directly, this file may disappear or change contents."
+#if !defined (_POLKIT_BACKEND_COMPILATION) || defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
+#error "This is a private header file."
#endif
#ifndef __POLKIT_BACKEND_LOCAL_AUTHORIZATION_STORE_H
@@ -39,6 +39,7 @@ G_BEGIN_DECLS
#define POLKIT_BACKEND_IS_LOCAL_AUTHORIZATION_STORE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), POLKIT_BACKEND_TYPE_LOCAL_AUTHORIZATION_STORE))
#define POLKIT_BACKEND_IS_LOCAL_AUTHORIZATION_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), POLKIT_BACKEND_TYPE_LOCAL_AUTHORIZATION_STORE))
+typedef struct _PolkitBackendLocalAuthorizationStore PolkitBackendLocalAuthorizationStore;
typedef struct _PolkitBackendLocalAuthorizationStoreClass PolkitBackendLocalAuthorizationStoreClass;
typedef struct _PolkitBackendLocalAuthorizationStorePrivate PolkitBackendLocalAuthorizationStorePrivate;
diff --git a/src/polkitbackend/polkitbackendprivate.h b/src/polkitbackend/polkitbackendprivate.h
index 900de99..d6fcdbf 100644
--- a/src/polkitbackend/polkitbackendprivate.h
+++ b/src/polkitbackend/polkitbackendprivate.h
@@ -19,6 +19,10 @@
* Author: David Zeuthen <davidz at redhat.com>
*/
+#if !defined (_POLKIT_BACKEND_COMPILATION) || defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
+#error "This is a private header file."
+#endif
+
#ifndef __POLKIT_BACKEND_PRIVATE_H
#define __POLKIT_BACKEND_PRIVATE_H
diff --git a/src/polkitbackend/polkitbackendsessionmonitor.h b/src/polkitbackend/polkitbackendsessionmonitor.h
index e498598..8f8a2ca 100644
--- a/src/polkitbackend/polkitbackendsessionmonitor.h
+++ b/src/polkitbackend/polkitbackendsessionmonitor.h
@@ -19,8 +19,8 @@
* Author: David Zeuthen <davidz at redhat.com>
*/
-#if !defined (_POLKIT_BACKEND_COMPILATION) && !defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
-#error "Only <polkitbackend/polkitbackend.h> can be included directly, this file may disappear or change contents."
+#if !defined (_POLKIT_BACKEND_COMPILATION) || defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H)
+#error "This is a private header file."
#endif
#ifndef __POLKIT_BACKEND_SESSION_MONITOR_H
@@ -38,9 +38,7 @@ G_BEGIN_DECLS
#define POLKIT_BACKEND_IS_SESSION_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), POLKIT_BACKEND_TYPE_SESSION_MONITOR))
#define POLKIT_BACKEND_IS_SESSION_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), POLKIT_BACKEND_TYPE_SESSION_MONITOR))
-#if 0
typedef struct _PolkitBackendSessionMonitor PolkitBackendSessionMonitor;
-#endif
typedef struct _PolkitBackendSessionMonitorClass PolkitBackendSessionMonitorClass;
GType polkit_backend_session_monitor_get_type (void) G_GNUC_CONST;
diff --git a/src/polkitbackend/polkitbackendtypes.h b/src/polkitbackend/polkitbackendtypes.h
index 6ebc881..d06f62a 100644
--- a/src/polkitbackend/polkitbackendtypes.h
+++ b/src/polkitbackend/polkitbackendtypes.h
@@ -24,12 +24,6 @@
#include <glib-object.h>
-struct _PolkitBackendSessionMonitor;
-typedef struct _PolkitBackendSessionMonitor PolkitBackendSessionMonitor;
-
-struct _PolkitBackendConfigSource;
-typedef struct _PolkitBackendConfigSource PolkitBackendConfigSource;
-
struct _PolkitBackendActionLookup;
typedef struct _PolkitBackendActionLookup PolkitBackendActionLookup; /* Dummy typedef */
@@ -42,8 +36,5 @@ typedef struct _PolkitBackendInteractiveAuthority PolkitBackendInteractiveAuthor
struct _PolkitBackendLocalAuthority;
typedef struct _PolkitBackendLocalAuthority PolkitBackendLocalAuthority;
-struct _PolkitBackendLocalAuthorizationStore;
-typedef struct _PolkitBackendLocalAuthorizationStore PolkitBackendLocalAuthorizationStore;
-
#endif /* __POLKIT_BACKEND_TYPES_H */
More information about the hal-commit
mailing list