PolicyKit: Branch 'master'

[David Zeuthen]

 src/nullbackend/polkitbackendnullauthority.c          |    4 ----
 src/polkit/polkitpermission.c                         |    3 ---
 src/polkitagent/polkitagentsession.c                  |    3 ---
 src/polkitbackend/polkitbackendactionpool.c           |    3 ---
 src/polkitbackend/polkitbackendinteractiveauthority.c |    2 +-
 5 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 302d2b6a0fa18168e42e2e62928485e610861633
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Mar 3 13:22:53 2011 -0500

    Fix a couple of warnings triggered by gcc 4.6
    
    Signed-off-by: David Zeuthen <davidz at redhat.com>

diff --git a/src/nullbackend/polkitbackendnullauthority.c b/src/nullbackend/polkitbackendnullauthority.c
index 6e969a0..7491540 100644
--- a/src/nullbackend/polkitbackendnullauthority.c
+++ b/src/nullbackend/polkitbackendnullauthority.c
@@ -66,10 +66,6 @@ polkit_backend_null_authority_init (PolkitBackendNullAuthority *authority)
 static void
 polkit_backend_null_authority_finalize (GObject *object)
 {
-  PolkitBackendNullAuthority *authority;
-
-  authority = POLKIT_BACKEND_NULL_AUTHORITY (object);
-
   G_OBJECT_CLASS (polkit_backend_null_authority_parent_class)->finalize (object);
 }
 
diff --git a/src/polkit/polkitpermission.c b/src/polkit/polkitpermission.c
index c855f2d..22d195f 100644
--- a/src/polkit/polkitpermission.c
+++ b/src/polkit/polkitpermission.c
@@ -535,9 +535,6 @@ acquire_cb (GObject      *source_object,
   AcquireData *data = user_data;
   PolkitAuthorizationResult *result;
   GError *error;
-  gboolean ret;
-
-  ret = FALSE;
 
   error = NULL;
   result = polkit_authority_check_authorization_finish (data->permission->authority,
diff --git a/src/polkitagent/polkitagentsession.c b/src/polkitagent/polkitagentsession.c
index 52fb020..bb467be 100644
--- a/src/polkitagent/polkitagentsession.c
+++ b/src/polkitagent/polkitagentsession.c
@@ -572,13 +572,10 @@ polkit_agent_session_initiate (PolkitAgentSession *session)
   uid_t uid;
   GError *error;
   gchar *helper_argv[4];
-  gboolean ret;
   struct passwd *passwd;
 
   g_return_if_fail (POLKIT_AGENT_IS_SESSION (session));
 
-  ret = FALSE;
-
   if (G_UNLIKELY (_show_debug ()))
     {
       gchar *s;
diff --git a/src/polkitbackend/polkitbackendactionpool.c b/src/polkitbackend/polkitbackendactionpool.c
index b705daa..e3ed38d 100644
--- a/src/polkitbackend/polkitbackendactionpool.c
+++ b/src/polkitbackend/polkitbackendactionpool.c
@@ -1043,12 +1043,9 @@ process_policy_file (PolkitBackendActionPool *pool,
                      const gchar *xml,
                      GError **error)
 {
-  gboolean ret;
   ParserData pd;
   int xml_res;
 
-  ret = FALSE;
-
   /* clear parser data */
   memset (&pd, 0, sizeof (ParserData));
 
diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
index 4f7828a..4100f87 100644
--- a/src/polkitbackend/polkitbackendinteractiveauthority.c
+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
@@ -277,7 +277,7 @@ polkit_backend_interactive_authority_init (PolkitBackendInteractiveAuthority *au
   static volatile GQuark domain = 0;
 
   /* Force registering error domain */
-  domain = POLKIT_ERROR;
+  domain = POLKIT_ERROR; domain;
 
   priv = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_PRIVATE (authority);