summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2007-03-10 09:13:57 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2007-03-10 09:13:57 +0000
commitd2a4955338a20e3eba0d8152e45e3f56a65b87ba (patch)
treec1118d6078001ebab555499d0e3148f11956ccad
parent47e318a6e1893069e1326945ce1af25ddf8201d1 (diff)
* dbus-win.patch: removed committed patch.
-rw-r--r--ChangeLog4
-rw-r--r--dbus-win.patch21
2 files changed, 4 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fb5fe17..865d2a0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-03-10 Ralf Habacker <ralf.habacker@freenet.de>
+ * dbus-win.patch: removed committed patches.
+
+2007-03-10 Ralf Habacker <ralf.habacker@freenet.de>
+
* bus/bus.c, bus/bus.h, bus/main.c, bus/test.c,
dbus/dbus-sysdeps-unix.c, dbus/dbus-sysdeps-util-unix.c,
dbus/dbus-sysdeps-util-win.c, dbus/dbus-sysdeps-win.c,
diff --git a/dbus-win.patch b/dbus-win.patch
index e4eef318..c83c3f2f 100644
--- a/dbus-win.patch
+++ b/dbus-win.patch
@@ -538,27 +538,6 @@ diff -u -r1.3 dbus-server-socket.c
client_fd = _dbus_accept (listen_fd);
-@@ -393,15 +393,19 @@
-
- if (port == NULL)
- {
-+#if defined(DBUS_WIN) || defined(DBUS_WINCE)
-+ port = "0";
-+#else
- _dbus_set_bad_address(error, "tcp", "port", NULL);
- return DBUS_SERVER_LISTEN_BAD_ADDRESS;
-+#endif
- }
-
- _dbus_string_init_const (&str, port);
- sresult = _dbus_string_parse_int (&str, 0, &lport, NULL);
- _dbus_string_free (&str);
-
-- if (sresult == FALSE || lport <= 0 || lport > 65535)
-+ if (sresult == FALSE || lport < 0 || lport > 65535)
- {
- _dbus_set_bad_address(error, NULL, NULL,
- "Port is not an integer between 0 and 65535");
Index: dbus/dbus-server.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-server.c,v