hal: Branch 'master'

[David Zeuthen]

 hald/hald.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

New commits:
diff-tree 8b320279cfb6a8ce96fcf5f271f7280c825b30a9 (from 95ddfe38d0f24ffe5250f19d4e44dcdc22f20158)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Apr 9 18:38:50 2007 -0400

    update to compile cleanly with PolicyKit master

diff --git a/hald/hald.c b/hald/hald.c
index 02e6645..23d57a1 100644
--- a/hald/hald.c
+++ b/hald/hald.c
@@ -409,7 +409,7 @@ _polkit_fm_notify_func (HalFileMonitor  
         }
 }
 
-static unsigned int
+static int
 _polkit_fm_add_watch (PolKitContext                     *pk_context,
                       const char                        *path,
                       PolKitContextFileMonitorEvent      event_mask,
@@ -442,12 +442,12 @@ _polkit_fm_add_watch (PolKitContext     
         }
 
 out:
-        return ret;
+        return (int) ret;
 }
 
 static void 
 _polkit_fm_remove_watch (PolKitContext *pk_context,
-                         unsigned int   watch_id)
+                         int   watch_id)
 {
         HalFileMonitor *file_monitor;
 
@@ -455,7 +455,7 @@ _polkit_fm_remove_watch (PolKitContext *
         if (file_monitor == NULL)
                 goto out;
 
-        hal_file_monitor_remove_notify (file_monitor, watch_id);
+        hal_file_monitor_remove_notify (file_monitor, (guint) watch_id);
 
 out:
         ;
@@ -509,7 +509,7 @@ main (int argc, char *argv[])
 	guint sigterm_iochn_listener_source_id;
 	char *path;
 	char newpath[512];
-        GError *g_error;
+        PolKitError *p_error;
 
 	openlog ("hald", LOG_PID, LOG_DAEMON);
 
@@ -746,7 +746,7 @@ main (int argc, char *argv[])
 	osspec_privileged_init ();
 
 #ifdef HAVE_POLKIT
-        g_error = NULL;
+        p_error = NULL;
         pk_context = libpolkit_context_new ();
         if (pk_context == NULL)
                 DIE (("Could not create PolicyKit context"));
@@ -756,8 +756,8 @@ main (int argc, char *argv[])
         libpolkit_context_set_file_monitor (pk_context, 
                                             _polkit_fm_add_watch,
                                             _polkit_fm_remove_watch);
-        if (!libpolkit_context_init (pk_context, &g_error))
-                DIE (("Could not init PolicyKit context: %s", g_error->message));
+        if (!libpolkit_context_init (pk_context, &p_error))
+                DIE (("Could not init PolicyKit context: %s", polkit_error_get_error_message (p_error)));
 #endif
 
 	/* sometimes we don't want to drop root privs, for instance