hal: Branch 'origin' - 2 commits

[Richard Hughes]

 hald-runner/main.c  |    2 +-
 partutil/partutil.c |    2 +-
 tools/hal-device.c  |    1 -
 tools/lshal.c       |    1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

New commits:
diff-tree 8ffd9707244b28a14d3756ddec8f73b0401dd1c0 (from c85e02d58d6503b494bb4c8584a7c44ac6923208)
Author: Doug Chapman <dchapman at redhat.com>
Date:   Fri Oct 27 13:31:24 2006 -0400

    fix unaligned messages (RH Bug #210079)

diff --git a/hald-runner/main.c b/hald-runner/main.c
index 18565bf..a9f366d 100644
--- a/hald-runner/main.c
+++ b/hald-runner/main.c
@@ -111,7 +111,7 @@ handle_start(DBusConnection *con, DBusMe
 	DBusMessage *reply;
 	DBusMessageIter iter;
 	run_request *r;
-	GPid pid;
+	GPid pid __attribute__ ((aligned));
 
 	r = new_run_request();
 	g_assert(dbus_message_iter_init(msg, &iter));
diff --git a/partutil/partutil.c b/partutil/partutil.c
index 3a2c87b..36078c0 100644
--- a/partutil/partutil.c
+++ b/partutil/partutil.c
@@ -491,7 +491,7 @@ static PartitionTable *
 part_table_parse_msdos (int fd, guint64 offset, guint64 size, gboolean *found_gpt)
 {
 	int n;
-	const guint8 mbr[512];
+	const guint8 mbr[512] __attribute__ ((aligned));
 	PartitionTable *p;
 
 	//HAL_INFO (("Entering MS-DOS parser"));
diff-tree c85e02d58d6503b494bb4c8584a7c44ac6923208 (from 9c99fc03fbac6380032a6678c641a76ef02ad834)
Author: Timo Hoenig <thoenig at suse.de>
Date:   Mon Oct 23 11:35:17 2006 -0400

    don't call dbus_connection_close() for some of our tools
    
    lshal and hal-device should not call dbus_connection_close() as they do
    not have a private connection to the bus.
    
    This is not critical. However, with D-Bus 0.94+ it will spawn ugly error
    messages.  Note: It is safe to apply this patch for HAL when using older
    versions of D-Bus, too.

diff --git a/tools/hal-device.c b/tools/hal-device.c
index 4c5678e..5dd5d8b 100644
--- a/tools/hal-device.c
+++ b/tools/hal-device.c
@@ -161,7 +161,6 @@ int main(int argc, char **argv)
 
 	libhal_ctx_shutdown(hal_ctx, &error);
 	libhal_ctx_free(hal_ctx);
-	dbus_connection_close(conn);
 	dbus_connection_unref(conn);
 	dbus_error_free(&error);
 
diff --git a/tools/lshal.c b/tools/lshal.c
index 377708f..1d3443c 100644
--- a/tools/lshal.c
+++ b/tools/lshal.c
@@ -723,7 +723,6 @@ main (int argc, char *argv[])
 		LIBHAL_FREE_DBUS_ERROR (&error);
 	libhal_ctx_free (hal_ctx);
 
-	dbus_connection_close (conn);
 	dbus_connection_unref (conn);
 
 	if (show_device)