[Pkg-utopia-commits] r1136 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-11-11 14:59:15 +0100 (Sat, 11 Nov 2006)
New Revision: 1136

Added:
   packages/unstable/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
* debian/patches/27_hal_fix_dbus_error_is_set.patch
  + Added. Ensure libhal never calls dbus_error_is_set(NULL) as that's not
  allowed in the D-Bus API

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-11-11 13:55:35 UTC (rev 1135)
+++ packages/unstable/hal/debian/changelog	2006-11-11 13:59:15 UTC (rev 1136)
@@ -19,8 +19,11 @@
   [ Sjoerd Simons ]
   * debian/patches/02_powerscripts.patch
     + Prefer hibernate over uswsusp. (Closes: #397302)
+  * debian/patches/27_hal_fix_dbus_error_is_set.patch
+    + Added. Ensure libhal never calls dbus_error_is_set(NULL) as that's not
+    allowed in the D-Bus API
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 11 Nov 2006 14:13:25 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 11 Nov 2006 14:16:52 +0100
 
 hal (0.5.8.1-3) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch
===================================================================
--- packages/unstable/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch	2006-11-11 13:55:35 UTC (rev 1135)
+++ packages/unstable/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch	2006-11-11 13:59:15 UTC (rev 1136)
@@ -0,0 +1,184 @@
+diff --git a/libhal/libhal.c b/libhal/libhal.c
+index e88ca3d..49ac5c4 100644
+--- a/libhal/libhal.c
++++ b/libhal/libhal.c
+@@ -1457,7 +1457,7 @@ libhal_device_set_property_helper (LibHa
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1650,7 +1650,7 @@ libhal_device_property_strlist_append (L
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1703,7 +1703,7 @@ libhal_device_property_strlist_prepend (
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1756,7 +1756,7 @@ libhal_device_property_strlist_remove_in
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1808,7 +1808,7 @@ libhal_device_property_strlist_remove (L
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1867,7 +1867,7 @@ libhal_device_lock (LibHalContext *ctx,
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		if (strcmp (error->name,
+ 			    "org.freedesktop.Hal.DeviceAlreadyLocked") == 0) {
+ 			if (reason_why_locked != NULL) {
+@@ -1928,7 +1928,7 @@ libhal_device_unlock (LibHalContext *ctx
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -1983,7 +1983,7 @@ libhal_new_device (LibHalContext *ctx, D
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return NULL;
+ 	}
+@@ -2066,7 +2066,7 @@ libhal_device_commit_to_gdl (LibHalConte
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2122,7 +2122,7 @@ libhal_remove_device (LibHalContext *ctx
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2314,7 +2314,7 @@ libhal_merge_properties (LibHalContext *
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2604,7 +2604,7 @@ libhal_device_add_capability (LibHalCont
+ 	reply = dbus_connection_send_with_reply_and_block (ctx->connection,
+ 							   message, -1,
+ 							   error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -2744,7 +2744,7 @@ libhal_device_property_watch_all (LibHal
+ 			    "type='signal',"
+ 			    "interface='org.freedesktop.Hal.Device',"
+ 			    "sender='org.freedesktop.Hal'", error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		return FALSE;
+ 	}
+ 	return TRUE;
+@@ -2778,7 +2778,7 @@ libhal_device_add_property_watch (LibHal
+ 		  "sender='org.freedesktop.Hal'," "path=%s", udi);
+ 
+ 	dbus_bus_add_match (ctx->connection, buf, error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		return FALSE;
+ 	}
+ 	return TRUE;
+@@ -2808,7 +2808,7 @@ libhal_device_remove_property_watch (Lib
+ 		  "sender='org.freedesktop.Hal'," "path=%s", udi);
+ 
+ 	dbus_bus_remove_match (ctx->connection, buf, error);
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		return FALSE;
+ 	}
+ 	return TRUE;
+@@ -3223,7 +3223,7 @@ libhal_device_rescan (LibHalContext *ctx
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -3283,7 +3283,7 @@ libhal_device_reprobe (LibHalContext *ct
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -3354,7 +3354,7 @@ dbus_bool_t libhal_device_emit_condition
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -3420,7 +3420,7 @@ libhal_device_addon_is_ready (LibHalCont
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}
+@@ -3491,7 +3491,7 @@ libhal_device_claim_interface (LibHalCon
+ 							   message, -1,
+ 							   error);
+ 
+-	if (dbus_error_is_set (error)) {
++	if (error != NULL && dbus_error_is_set (error)) {
+ 		dbus_message_unref (message);
+ 		return FALSE;
+ 	}