PolicyKit: Branch 'master'

[David Zeuthen]

 configure.ac          |    3 ++-
 src/examples/cancel.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cd1f6a9bee4ad880f8e087b0b15d44e609553f4c
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Mar 3 13:31:52 2011 -0500

    Build examples by default and fix compiler warnings
    
    Signed-off-by: David Zeuthen <davidz at redhat.com>

diff --git a/configure.ac b/configure.ac
index b36bda2..5d5aa01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,7 +383,7 @@ GOBJECT_INTROSPECTION_CHECK([0.6.2])
 
 AC_ARG_ENABLE([examples],
               AS_HELP_STRING([--enable-examples], [Build the example programs]),,
-              [enable_examples=no])
+              [enable_examples=yes])
 
 AM_CONDITIONAL(BUILD_EXAMPLES, test "x$enable_examples" = "xyes")
 
@@ -459,6 +459,7 @@ echo "
         Building verbose mode:      ${enable_verbose_mode}
         Building api docs:          ${enable_gtk_doc}
         Building man pages:         ${enable_man_pages}
+        Building examples:          ${enable_examples}
 
 "
 
diff --git a/src/examples/cancel.c b/src/examples/cancel.c
index fd94b0e..8de5cd3 100644
--- a/src/examples/cancel.c
+++ b/src/examples/cancel.c
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
 
   loop = g_main_loop_new (NULL, FALSE);
 
-  authority = polkit_authority_get ();
+  authority = polkit_authority_get_sync (NULL, NULL);
 
   /* Typically mechanisms will use a PolkitSystemBusName since most
    * clients communicate with the mechanism via D-Bus. However for