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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-11-11 14:01:08 +0100 (Sat, 11 Nov 2006)
New Revision: 1133

Removed:
   packages/unstable/hal/debian/patches/27_dbus_is_error_set.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
Remove 27_dbus_is_error_set.patch, it doesn't fix the mentioned issue

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-11-10 09:44:48 UTC (rev 1132)
+++ packages/unstable/hal/debian/changelog	2006-11-11 13:01:08 UTC (rev 1133)
@@ -15,9 +15,6 @@
     + debian/patches/26_fix_hald_not_running_coredump.patch:
       - Don't coredump utilities when hald is not running but print a usefull
         error message. GIT changeset c2053bf825cd9d81949d63ad83790a68310bb808
-    + debian/patches/27_dbus_is_error_set.patch:
-      - Don't call dbus_error_is_set() with NULL. This is invalid usage of DBus
-        API. GIT changeset 0a9965e4aa4ffc2f382d7fe1286937308439fd1f
 
  -- Sebastian Dröge <slomo at ubuntu.com>  Thu,  9 Nov 2006 23:48:31 +0100
 

Deleted: packages/unstable/hal/debian/patches/27_dbus_is_error_set.patch
===================================================================
--- packages/unstable/hal/debian/patches/27_dbus_is_error_set.patch	2006-11-10 09:44:48 UTC (rev 1132)
+++ packages/unstable/hal/debian/patches/27_dbus_is_error_set.patch	2006-11-11 13:01:08 UTC (rev 1133)
@@ -1,82 +0,0 @@
-From: Danny Kukawka <danny.kukawka at web.de>
-Date: Fri, 13 Oct 2006 09:46:03 +0000 (+0200)
-Subject: replaced LIBHAL_FREE_DBUS_ERROR with dbus_error_free()
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=0a9965e4aa4ffc2f382d7fe1286937308439fd1f
-
-replaced LIBHAL_FREE_DBUS_ERROR with dbus_error_free()
-
-Replaced _again_ usage of macro LIBHAL_FREE_DBUS_ERROR with
-dbus_error_free().
-
-NOTE: If you use dbus_error_is_set() to check if the error is set,
-      you should not use LIBHAL_FREE_DBUS_ERROR to free the error.
-      Better use dbus_error_free() directly in this case to avoid
-      double call of dbus_error_is_set().
----
-
---- a/tools/hal-device.c
-+++ b/tools/hal-device.c
-@@ -142,7 +142,7 @@ int main(int argc, char **argv)
- 	if (!libhal_ctx_init(hal_ctx, &error)) {
- 		if (dbus_error_is_set(&error)) {
- 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
--			LIBHAL_FREE_DBUS_ERROR (&error);
-+			dbus_error_free (&error);
- 		}
- 		fprintf (stderr, "Could not initialise connection to hald.\n"
- 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
---- a/tools/hal_find_by_property.c
-+++ b/tools/hal_find_by_property.c
-@@ -156,7 +156,7 @@ main (int argc, char *argv[])
- 	if (!libhal_ctx_init (hal_ctx, &error)) {
- 		if (dbus_error_is_set(&error)) {
- 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
--			LIBHAL_FREE_DBUS_ERROR (&error);
-+			dbus_error_free (&error);
- 		}
- 		fprintf (stderr, "Could not initialise connection to hald.\n"
- 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
-@@ -168,7 +168,7 @@ main (int argc, char *argv[])
- 
- 	if (dbus_error_is_set (&error)) {
- 		fprintf (stderr, "error: %s: %s\n", error.name, error.message);
--		LIBHAL_FREE_DBUS_ERROR (&error);
-+		dbus_error_free (&error);
- 		return 1;
- 	}
- 
---- a/tools/hal_get_property.c
-+++ b/tools/hal_get_property.c
-@@ -165,7 +165,7 @@ main (int argc, char *argv[])
- 	if (!libhal_ctx_init (hal_ctx, &error)) {
- 		if (dbus_error_is_set(&error)) {
- 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
--			LIBHAL_FREE_DBUS_ERROR (&error);
-+			dbus_error_free (&error);
- 		}
- 		fprintf (stderr, "Could not initialise connection to hald.\n"
- 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
---- a/tools/hal_set_property.c
-+++ b/tools/hal_set_property.c
-@@ -232,7 +232,7 @@ main (int argc, char *argv[])
- 	if (!libhal_ctx_init (hal_ctx, &error)) {
- 		if (dbus_error_is_set(&error)) {
- 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
--			LIBHAL_FREE_DBUS_ERROR (&error);
-+			dbus_error_free (&error);
- 		}
- 		fprintf (stderr, "Could not initialise connection to hald.\n"
- 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
---- a/tools/lshal.c
-+++ b/tools/lshal.c
-@@ -684,7 +684,7 @@ main (int argc, char *argv[])
- 	if (!libhal_ctx_init (hal_ctx, &error)) {
- 		if (dbus_error_is_set(&error)) {
- 			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
--			LIBHAL_FREE_DBUS_ERROR (&error);
-+			dbus_error_free (&error);
- 		}
- 		fprintf (stderr, "Could not initialise connection to hald.\n"
- 				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
-
-