projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...
[platform/upstream/dbus.git]
/
dbus
/
dbus-server-socket.c
diff --git
a/dbus/dbus-server-socket.c
b/dbus/dbus-server-socket.c
index
02973c1
..
ae4b602
100644
(file)
--- a/
dbus/dbus-server-socket.c
+++ b/
dbus/dbus-server-socket.c
@@
-89,10
+89,8
@@
handle_new_client_fd_and_unlock (DBusServer *server,
DBusConnection *connection;
DBusTransport *transport;
DBusNewConnectionFunction new_connection_function;
DBusConnection *connection;
DBusTransport *transport;
DBusNewConnectionFunction new_connection_function;
- DBusServerSocket* socket_server;
void *new_connection_data;
void *new_connection_data;
- socket_server = (DBusServerSocket*)server;
_dbus_verbose ("Creating new client connection with fd %d\n", client_fd);
HAVE_LOCK_CHECK (server);
_dbus_verbose ("Creating new client connection with fd %d\n", client_fd);
HAVE_LOCK_CHECK (server);
@@
-345,6
+343,7
@@
_dbus_server_new_for_socket (int *fds,
SERVER_UNLOCK (server);
SERVER_UNLOCK (server);
+ _dbus_server_trace_ref (&socket_server->base, 0, 1, "new_for_socket");
return (DBusServer*) socket_server;
failed_2:
return (DBusServer*) socket_server;
failed_2: