Sophie

Sophie

distrib > Mandriva > 2007.1 > i586 > by-pkgid > 957da2639ff0ff03ed8e388494a58800 > files > 145

kdebase4-3.80.3-0.20070311.6mdv2007.1.src.rpm

--- kdebase-3.5.5/kioslave/media/mediamanager/halbackend.cpp.fixdbus	2006-10-30 10:32:06.000000000 +0100
+++ kdebase-3.5.5/kioslave/media/mediamanager/halbackend.cpp	2006-10-30 10:38:12.000000000 +0100
@@ -111,7 +111,7 @@
     kdDebug(1219) << "Main loop integration" << endl;
     DBusError error;
     dbus_error_init(&error);
-    dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
+    dbus_connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
 
     if (!dbus_connection || dbus_error_is_set(&error)) {
         dbus_error_free(&error);
@@ -120,14 +120,8 @@
         return false;
     }
 
-    dbus_bus_register(dbus_connection, &error);
+    dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
 
-    if (dbus_error_is_set(&error)) {
-        dbus_error_free(&error);
-        libhal_ctx_free(m_halContext);
-        m_halContext = NULL;
-        return false;
-    }
     MainLoopIntegration(dbus_connection);
     libhal_ctx_set_dbus_connection(m_halContext, dbus_connection);