summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-10 15:22:16 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-06-05 12:18:23 +0100
commitdf80949d92df8695900f8dda51c1d5ea23bbb6d2 (patch)
tree66789100556af744723f2aebb588d31b9cd4689f
parentad7245627cde935297d83be0e918fa66852cc1c8 (diff)
downloaddbus-df80949d92df8695900f8dda51c1d5ea23bbb6d2.tar.gz
dbus-df80949d92df8695900f8dda51c1d5ea23bbb6d2.tar.bz2
dbus-df80949d92df8695900f8dda51c1d5ea23bbb6d2.zip
Remove duplicate nonce-tcp (service-side) transport on Windows
Turns out this was duplicated too. We can just use the platform-independent version, which uses the same code. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45896 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Tested-by: Ralf Habacker <ralf.habacker@freenet.de>
-rw-r--r--dbus/dbus-server-win.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/dbus/dbus-server-win.c b/dbus/dbus-server-win.c
index bf1c896c..bb6da483 100644
--- a/dbus/dbus-server-win.c
+++ b/dbus/dbus-server-win.c
@@ -57,33 +57,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
method = dbus_address_entry_get_method (entry);
- if (strcmp (method, "nonce-tcp") == 0)
- {
- const char *host;
- const char *port;
- const char *bind;
- const char *family;
-
- host = dbus_address_entry_get_value (entry, "host");
- bind = dbus_address_entry_get_value (entry, "bind");
- port = dbus_address_entry_get_value (entry, "port");
- family = dbus_address_entry_get_value (entry, "family");
-
- *server_p = _dbus_server_new_for_tcp_socket (host, bind, port,
- family, error, TRUE);
-
- if (*server_p)
- {
- _DBUS_ASSERT_ERROR_IS_CLEAR(error);
- return DBUS_SERVER_LISTEN_OK;
- }
- else
- {
- _DBUS_ASSERT_ERROR_IS_SET(error);
- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
- }
- }
- else if (strcmp (method, "autolaunch") == 0)
+ if (strcmp (method, "autolaunch") == 0)
{
const char *host = "localhost";
const char *bind = "localhost";