X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-server-socket.c;h=8e31da9d59f6f43a9bba9d5e92405c675ad601f2;hb=818e62f15f30f284f4cfddf5725972975b97ce52;hp=e8a24e48d8695861e9e25a7ac2adfba2d9451bf2;hpb=9fee6d735ec674faab98379511257669f93b9ae7;p=platform%2Fupstream%2Fdbus.git

diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
index e8a24e4..8e31da9 100644
--- 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;
-  DBusServerSocket* socket_server;
   void *new_connection_data;
 
-  socket_server = (DBusServerSocket*)server;
   _dbus_verbose ("Creating new client connection with fd %d\n", client_fd);
 
   HAVE_LOCK_CHECK (server);
@@ -236,6 +234,7 @@ socket_disconnect (DBusServer *server)
         {
           _dbus_server_remove_watch (server,
                                      socket_server->watch[i]);
+          _dbus_watch_invalidate (socket_server->watch[i]);
           _dbus_watch_unref (socket_server->watch[i]);
           socket_server->watch[i] = NULL;
         }