[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:03:57 UTC 2012


The following commit has been merged in the wheezy branch:
commit bfda26f1b8541224130c75656ec3394df63828e5
Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Jun 6 11:46:38 2012 +0200

    mountmgr.sys: Don't try to close the dbus connection.
    (cherry picked from commit 6157f4a9f4fc15c313500302c153e3f455ceb8bb)

diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c
index ab7d912..608efd0 100644
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
     DO_FUNC(dbus_bus_get); \
     DO_FUNC(dbus_bus_remove_match); \
     DO_FUNC(dbus_connection_add_filter); \
-    DO_FUNC(dbus_connection_close); \
     DO_FUNC(dbus_connection_read_write_dispatch); \
     DO_FUNC(dbus_connection_remove_filter); \
     DO_FUNC(dbus_connection_send_with_reply_and_block); \
@@ -526,7 +525,6 @@ static DWORD WINAPI dbus_thread( void *arg )
 #ifdef SONAME_LIBHAL
         if (!hal_enumerate_devices())
         {
-            p_dbus_connection_close( connection );
             p_dbus_error_free( &error );
             return 1;
         }
@@ -544,7 +542,6 @@ static DWORD WINAPI dbus_thread( void *arg )
     }
     __ENDTRY;
 
-    p_dbus_connection_close( connection );
     return 0;
 }
 

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list