hal: Branch 'master' - 2 commits

[David Zeuthen]

 hald/hald_dbus.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree be426425d6e3629b39b90c9a468a875e446f0785 (from 8873d79ec94d921e2950d1b860c79be39df30c4f)
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Jun 1 16:44:00 2007 -0400

    also change type from uint32_t to int32_t

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 47ef7cf..395acca 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -3675,7 +3675,7 @@ hald_exec_method_cb (HalDevice *d, guint
 		     gint return_code, gchar **error,
 		     gpointer data1, gpointer data2)
 {
-	dbus_uint32_t result;
+	dbus_int32_t result;
 	DBusMessage *reply = NULL;
 	DBusMessage *message;
 	DBusMessageIter iter;
diff-tree 8873d79ec94d921e2950d1b860c79be39df30c4f (from edef57f684d34513f542344c0cc4bad40bccf043)
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Jun 1 16:41:10 2007 -0400

    actually return INT32 rather than UINT32 to adhere to the spec
    
    This should fix some problems with laptop panels; see the list
    archives for May 2007.

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 8cb09ae..47ef7cf 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -3720,14 +3720,14 @@ hald_exec_method_cb (HalDevice *d, guint
 		dbus_message_unref (reply);
 
 	} else {
-		result = (dbus_uint32_t) return_code;
+		result = (dbus_int32_t) return_code;
 
 		reply = dbus_message_new_method_return (message);
 		if (reply == NULL)
 			DIE (("No memory"));
 		
 		dbus_message_iter_init_append (reply, &iter);
-		dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &result);
+		dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &result);
 		
 		if (conn != NULL) {
 			if (!dbus_connection_send (conn, reply, NULL))