[maemo-commits] [maemo-commits] r14647 - projects/haf/trunk/dbus/debian/patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-26 18:14:50 +0300 (Fri, 26 Oct 2007)
New Revision: 14647

Modified:
   projects/haf/trunk/dbus/debian/patches/35-unref-no-guid-connections.patch
Log:
old one was better


Modified: projects/haf/trunk/dbus/debian/patches/35-unref-no-guid-connections.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/35-unref-no-guid-connections.patch	2007-10-26 14:58:06 UTC (rev 14646)
+++ projects/haf/trunk/dbus/debian/patches/35-unref-no-guid-connections.patch	2007-10-26 15:14:50 UTC (rev 14647)
@@ -1,7 +1,7 @@
 diff -pur dbus-1.0.2/dbus/dbus-connection.c dbus-1.0.2.new/dbus/dbus-connection.c
 --- dbus-1.0.2/dbus/dbus-connection.c	2006-12-11 21:21:08.000000000 +0200
-+++ dbus-1.0.2.new/dbus/dbus-connection.c	2007-10-26 17:40:37.758540064 +0300
-@@ -1434,6 +1434,26 @@ _dbus_connection_handle_watch (DBusWatch
++++ dbus-1.0.2.new/dbus/dbus-connection.c	2007-10-26 16:21:04.047254488 +0300
+@@ -1434,6 +1434,27 @@ _dbus_connection_handle_watch (DBusWatch
  
  _DBUS_DEFINE_GLOBAL_LOCK (shared_connections);
  static DBusHashTable *shared_connections = NULL;
@@ -14,6 +14,7 @@
 +
 +  _DBUS_UNLOCK (shared_connections);
 +
++  dbus_connection_ref (connection);
 +  _dbus_connection_close_possibly_shared (connection);
 +
 +  /* Churn through to the Disconnected message */
@@ -21,14 +22,14 @@
 +    {
 +      dbus_message_unref (message);
 +    }
-+  dbus_connection_unref (connection); /* drop the hard reference */
++  dbus_connection_unref (connection);
 +      
 +  _DBUS_LOCK (shared_connections);
 +}
  
  static void
  shared_connections_shutdown (void *data)
-@@ -1446,7 +1466,6 @@ shared_connections_shutdown (void *data)
+@@ -1446,7 +1467,6 @@ shared_connections_shutdown (void *data)
    while ((n_entries = _dbus_hash_table_get_n_entries (shared_connections)) > 0)
      {
        DBusConnection *connection;
@@ -36,7 +37,7 @@
        DBusHashIter iter;
        
        _dbus_hash_iter_init (shared_connections, &iter);
-@@ -1454,19 +1473,7 @@ shared_connections_shutdown (void *data)
+@@ -1454,19 +1474,7 @@ shared_connections_shutdown (void *data)
         
        connection = _dbus_hash_iter_get_value (&iter);
  
@@ -57,7 +58,7 @@
  
        /* The connection should now be dead and not in our hash ... */
        _dbus_assert (_dbus_hash_table_get_n_entries (shared_connections) < n_entries);
-@@ -1476,6 +1483,19 @@ shared_connections_shutdown (void *data)
+@@ -1476,6 +1484,19 @@ shared_connections_shutdown (void *data)
    
    _dbus_hash_table_unref (shared_connections);
    shared_connections = NULL;
@@ -77,7 +78,7 @@
    
    _DBUS_UNLOCK (shared_connections);
  }
-@@ -1585,7 +1605,18 @@ connection_record_shared_unlocked (DBusC
+@@ -1585,7 +1606,18 @@ connection_record_shared_unlocked (DBusC
    _dbus_connection_ref_unlocked (connection);
  
    if (guid == NULL)