PolicyKit: Branch 'master'

[David Zeuthen]

 polkit-grant/polkit-grant-helper.c |    6 ++++++
 polkit-grant/polkit-grant.c        |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
diff-tree 1f431e5f5bdf251edad794ec2259e8576d2892f7 (from 6efff0882a712424eeee0d7644b213127b3eded6)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Aug 20 19:59:49 2007 -0400

    make libpolkit-grant less noisy

diff --git a/polkit-grant/polkit-grant-helper.c b/polkit-grant/polkit-grant-helper.c
index 0358973..bcbcf16 100644
--- a/polkit-grant/polkit-grant-helper.c
+++ b/polkit-grant/polkit-grant-helper.c
@@ -449,14 +449,18 @@ get_and_validate_override_details (PolKi
         }
         textual_result = buf + sizeof "POLKIT_GRANT_CALLER_PASS_OVERRIDE_GRANT_TYPE " - 1;
 
+#ifdef PGH_DEBUG
         fprintf (stderr, "polkit-grant-helper: caller said '%s'\n", textual_result);
+#endif /* PGH_DEBUG */
 
         if (!polkit_result_from_string_representation (textual_result, &desired_result))
                 goto error;
 
+#ifdef PGH_DEBUG
         fprintf (stderr, "polkit-grant-helper: testing for voluntarily downgrade from '%s' to '%s'\n",
                  polkit_result_to_string_representation (*result),
                  polkit_result_to_string_representation (desired_result));
+#endif /* PGH_DEBUG */
 
         /* See the huge comment in main() below... 
          *
@@ -500,11 +504,13 @@ get_and_validate_override_details (PolKi
                 goto error;
         }
 
+#ifdef PGH_DEBUG
         if (*result != desired_result) {
                 fprintf (stderr, "polkit-grant-helper: voluntarily downgrading from '%s' to '%s'\n",
                          polkit_result_to_string_representation (*result),
                          polkit_result_to_string_representation (desired_result));
         }
+#endif /* PGH_DEBUG */
 
         *result = desired_result;
 
diff --git a/polkit-grant/polkit-grant.c b/polkit-grant/polkit-grant.c
index a79c86b..73ecbda 100644
--- a/polkit-grant/polkit-grant.c
+++ b/polkit-grant/polkit-grant.c
@@ -234,7 +234,7 @@ polkit_grant_child_func (PolKitGrant *po
         g_return_if_fail (polkit_grant != NULL);
         g_return_if_fail (polkit_grant->helper_is_running);
 
-        g_debug ("pid %d terminated", pid);
+        /* g_debug ("pid %d terminated", pid); */
         waitpid (pid, &status, 0);
 
         if (exit_code >= 2)