PolicyKit: Branch 'master'

[David Zeuthen]

 libpolkit/libpolkit-context.c      |    4 ++--
 libpolkit/libpolkit-policy-cache.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree ee531eefb45fd362c8aa3e8cb395549dda50f446 (from ee660301bbeed46cc49eb06cf6853a28fcbb4812)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Apr 8 19:38:02 2007 -0400

    policy files now have the .policy extension, not .priv

diff --git a/libpolkit/libpolkit-context.c b/libpolkit/libpolkit-context.c
index 3ea7fd3..205bea3 100644
--- a/libpolkit/libpolkit-context.c
+++ b/libpolkit/libpolkit-context.c
@@ -285,7 +285,7 @@ libpolkit_context_init (PolKitContext *p
         /* don't populate the cache until it's needed.. */
 
         if (pk_context->file_monitor_add_watch_func == NULL) {
-                _pk_debug ("No file monitor; cannot monitor '%s' for .priv file changes", dirname);
+                _pk_debug ("No file monitor; cannot monitor '%s' for .policy file changes", pk_context->policy_dir);
         } else {
                 /* Watch when policy definitions file change */
                 pk_context->file_monitor_add_watch_func (pk_context, 
@@ -425,7 +425,7 @@ libpolkit_context_get_policy_cache (PolK
                                    pk_context->policy_dir, error->message);
                         g_error_free (error);
                 } else {
-                        /*libpolkit_policy_cache_debug (pk_context->priv_cache)*/;
+                        libpolkit_policy_cache_debug (pk_context->priv_cache);
                 }
         }
 
diff --git a/libpolkit/libpolkit-policy-cache.c b/libpolkit/libpolkit-policy-cache.c
index d9eb31b..a2c8d4a 100644
--- a/libpolkit/libpolkit-policy-cache.c
+++ b/libpolkit/libpolkit-policy-cache.c
@@ -107,7 +107,7 @@ libpolkit_policy_cache_new (const char *
                 char *path;
                 PolKitPolicyFile *pf;
 
-                if (!g_str_has_suffix (file, ".priv"))
+                if (!g_str_has_suffix (file, ".policy"))
                         continue;
 
                 if (g_str_has_prefix (file, "."))