PolicyKit: Branch 'master'

[David Zeuthen]

 polkit/polkit-context.h |   16 +++++++++-------
 polkit/polkit-types.h   |    9 +++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 9bd3cbe09448b0468958b9ce5ab0d4d05e24a7b0
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Oct 23 15:37:38 2007 -0400

    move POLKIT_GNUC_DEPRECATED to a separate line so gtk-doc is happy
    
    Also document this symbol

diff --git a/polkit/polkit-context.h b/polkit/polkit-context.h
index 8163ab0..f22c1db 100644
--- a/polkit/polkit-context.h
+++ b/polkit/polkit-context.h
@@ -158,13 +158,15 @@ void           polkit_context_io_func                (PolKitContext *pk_context,
 
 PolKitPolicyCache *polkit_context_get_policy_cache   (PolKitContext *pk_context);
 
-POLKIT_GNUC_DEPRECATED PolKitResult polkit_context_can_session_do_action    (PolKitContext   *pk_context,
-                                                                             PolKitAction    *action,
-                                                                             PolKitSession   *session);
-
-POLKIT_GNUC_DEPRECATED PolKitResult polkit_context_can_caller_do_action     (PolKitContext   *pk_context,
-                                                                             PolKitAction    *action,
-                                                                             PolKitCaller    *caller);
+POLKIT_GNUC_DEPRECATED
+PolKitResult polkit_context_can_session_do_action    (PolKitContext   *pk_context,
+                                                      PolKitAction    *action,
+                                                      PolKitSession   *session);
+
+POLKIT_GNUC_DEPRECATED 
+PolKitResult polkit_context_can_caller_do_action     (PolKitContext   *pk_context,
+                                                      PolKitAction    *action,
+                                                      PolKitCaller    *caller);
 
 PolKitConfig *polkit_context_get_config (PolKitContext *pk_context, PolKitError **error);
 
diff --git a/polkit/polkit-types.h b/polkit/polkit-types.h
index 1a97dd3..8bcf1ad 100644
--- a/polkit/polkit-types.h
+++ b/polkit/polkit-types.h
@@ -37,13 +37,13 @@
 /**
  * POLKIT_BEGIN_DECLS:
  *
- * C++ include header guard
+ * C++ include header guard.
  */
 #  define POLKIT_BEGIN_DECLS
 /**
  * POLKIT_END_DECLS:
  *
- * C++ include header guard
+ * C++ include header guard.
  */
 #  define POLKIT_END_DECLS
 #endif
@@ -52,6 +52,11 @@
 #define POLKIT_GNUC_DEPRECATED                            \
   __attribute__((__deprecated__))
 #else
+/**
+ * POLKIT_GNUC_DEPRECATED:
+ *
+ * Used in front of deprecated functions.
+ */
 #define POLKIT_GNUC_DEPRECATED
 #endif /* __GNUC__ */