[maemo-commits] [maemo-commits] r13437 - in projects/haf/trunk/maemo-launcher: . debian launcher

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-08-28 17:13:47 +0300 (Tue, 28 Aug 2007)
New Revision: 13437

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c
Log:
Do not call dbus_shutdown as libdbus is too eager to abort. (Fixes: NB#65588)


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-08-28 13:50:08 UTC (rev 13436)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-08-28 14:13:47 UTC (rev 13437)
@@ -1,3 +1,8 @@
+2007-08-28  Guillem Jover  <guillem.jover at nokia.com>
+
+	* launcher/comm_dbus.c (comm_dbus_finish): Do not call dbus_shutdown,
+	as libdbus is too eager throwing abort(3) around.
+
 2007-08-20  Guillem Jover  <guillem.jover at nokia.com>
 
 	* README: Refer to MAEMO_LAUNCHER_LIBS instead of

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2007-08-28 13:50:08 UTC (rev 13436)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2007-08-28 14:13:47 UTC (rev 13437)
@@ -1,6 +1,8 @@
 maemo-launcher (0.24-1) UNRELEASED; urgency=low
 
   * New Upstream Release.
+    - Do not call dbus_shutdown as libdbus is too eager to abort.
+      (Fixes: NB#65588)
 
  -- Guillem Jover <guillem.jover at nokia.com>  Mon, 20 Aug 2007 14:23:51 +0300
 

Modified: projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c	2007-08-28 13:50:08 UTC (rev 13436)
+++ projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c	2007-08-28 14:13:47 UTC (rev 13437)
@@ -44,8 +44,6 @@
 {
   dbus_connection_unref(conn);
   conn = NULL;
-
-  dbus_shutdown();
 }
 
 static void