hal: Branch 'origin'

[David Zeuthen]

 hald/hald_runner.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

New commits:
diff-tree 482a82f7f06303467b86f18cc9db793514660a78 (from 607bc736215bd2769d79877dda9327623637fb49)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Sep 13 20:04:52 2006 -0400

    fix up overflow of 32-bit variable when getting 64-bit value

diff --git a/hald/hald_runner.c b/hald/hald_runner.c
index 4fa7b44..0d80683 100644
--- a/hald/hald_runner.c
+++ b/hald/hald_runner.c
@@ -104,20 +104,21 @@ runner_server_message_handler (DBusConne
 		   dbus_message_get_path (message), 
 		   dbus_message_get_interface (message),
 		   dbus_message_get_member (message)));*/
-
 	if (dbus_message_is_signal (message, 
 				    "org.freedesktop.HalRunner", 
 				    "StartedProcessExited")) {
-		GPid pid;
+		dbus_uint64_t dpid;
 		DBusError error;
 		dbus_error_init (&error);
 		if (dbus_message_get_args (message, &error,
-				   DBUS_TYPE_INT64, &pid,
-				   DBUS_TYPE_INVALID)) {
+					   DBUS_TYPE_INT64, &dpid,
+					   DBUS_TYPE_INVALID)) {
 			RunningProcess *rp;
+			GPid pid;
 
-			/*HAL_INFO (("Previously started process with pid %d exited", pid));*/
+			pid = (GPid) dpid;
 
+			/*HAL_INFO (("Previously started process with pid %d exited", pid));*/
 			rp = g_hash_table_lookup (running_processes, (gpointer) pid);
 			if (rp != NULL) {
 				rp->cb (rp->device, 0, 0, NULL, rp->data1, rp->data2);
@@ -125,9 +126,8 @@ runner_server_message_handler (DBusConne
 				g_free (rp);
 			}
 		}
-		
 	}
-
+	HAL_INFO (("foo2"));
 
 	return DBUS_HANDLER_RESULT_HANDLED;
 }