Merge branch 'dbus-1.2'

diff --combined dbus/dbus-connection.c
index 804af82,2e291ee..a960a99
--- 1/dbus/dbus-connection.c
--- 2/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@@ -1678,26 -1678,21 +1678,26 @@@ connection_forget_shared_unlocked (DBus
    if (!connection->shareable)
      return;
    
 +  _DBUS_LOCK (shared_connections);
 +      
    if (connection->server_guid != NULL)
      {
        _dbus_verbose ("dropping connection to %s out of the shared table\n",
                       connection->server_guid);
        
 -      _DBUS_LOCK (shared_connections);
 -      
        if (!_dbus_hash_table_remove_string (shared_connections,
                                             connection->server_guid))
          _dbus_assert_not_reached ("connection was not in the shared table");
        
        dbus_free (connection->server_guid);
        connection->server_guid = NULL;
 -      _DBUS_UNLOCK (shared_connections);
      }
 +  else
 +    {
 +      _dbus_list_remove (&shared_connections_no_guid, connection);
 +    }
 +
 +  _DBUS_UNLOCK (shared_connections);
    
    /* remove our reference held on all shareable connections */
    _dbus_connection_unref_unlocked (connection);
@@@ -3416,14 -3411,9 +3416,13 @@@ _dbus_connection_read_write_dispatch (D
                                       dbus_bool_t     dispatch)
  {
    DBusDispatchStatus dstatus;
--  dbus_bool_t no_progress_possible;
+   dbus_bool_t progress_possible;
 -  
 +
 +  /* Need to grab a ref here in case we're a private connection and
 +   * the user drops the last ref in a handler we call; see bug 
 +   * https://bugs.freedesktop.org/show_bug.cgi?id=15635
 +   */
 +  dbus_connection_ref (connection);
-   
    dstatus = dbus_connection_get_dispatch_status (connection);
  
    if (dispatch && dstatus == DBUS_DISPATCH_DATA_REMAINS)
@@@ -3458,16 -3448,13 +3457,16 @@@
     * as long as the transport is open.
     */
    if (dispatch)
-     no_progress_possible = connection->n_incoming == 0 &&
-       connection->disconnect_message_link == NULL;
+     progress_possible = connection->n_incoming != 0 ||
+       connection->disconnect_message_link != NULL;
    else
-     no_progress_possible = _dbus_connection_get_is_connected_unlocked (connection);
+     progress_possible = _dbus_connection_get_is_connected_unlocked (connection);
  
    CONNECTION_UNLOCK (connection);
-   return !no_progress_possible; /* TRUE if we can make more progress */
 +
 +  dbus_connection_unref (connection);
 +
+   return progress_possible; /* TRUE if we can make more progress */
  }
  
  
@@@ -4986,40 -4973,6 +4985,40 @@@ dbus_connection_get_unix_process_id (DB
  }
  
  /**
 + * Gets the ADT audit data of the connection if any.
 + * Returns #TRUE if the structure pointer is returned.
 + * Always returns #FALSE prior to authenticating the
 + * connection.
 + *
 + * @param connection the connection
 + * @param data return location for audit data 
 + * @returns #TRUE if audit data is filled in with a valid ucred pointer
 + */
 +dbus_bool_t
 +dbus_connection_get_adt_audit_session_data (DBusConnection *connection,
 +                                          void          **data,
 +                                          dbus_int32_t   *data_size)
 +{
 +  dbus_bool_t result;
 +
 +  _dbus_return_val_if_fail (connection != NULL, FALSE);
 +  _dbus_return_val_if_fail (data != NULL, FALSE);
 +  _dbus_return_val_if_fail (data_size != NULL, FALSE);
 +  
 +  CONNECTION_LOCK (connection);
 +
 +  if (!_dbus_transport_get_is_authenticated (connection->transport))
 +    result = FALSE;
 +  else
 +    result = _dbus_transport_get_adt_audit_session_data (connection->transport,
 +                                                       data,
 +                                                       data_size);
 +  CONNECTION_UNLOCK (connection);
 +
 +  return result;
 +}
 +
 +/**
   * Sets a predicate function used to determine whether a given user ID
   * is allowed to connect. When an incoming connection has
   * authenticated with a particular user ID, this function is called;