dbus ChangeLog,1.1251,1.1252 dbus-win.patch,1.9,1.10

Ralf Habacker rhabacker at kemper.freedesktop.org
Sat Mar 10 01:13:59 PST 2007


Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv6399

Modified Files:
	ChangeLog dbus-win.patch 
Log Message:
* dbus-win.patch: removed committed patch.

Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1251
retrieving revision 1.1252
diff -u -d -r1.1251 -r1.1252
--- ChangeLog	10 Mar 2007 09:10:36 -0000	1.1251
+++ ChangeLog	10 Mar 2007 09:13:57 -0000	1.1252
@@ -1,5 +1,9 @@
 2007-03-10  Ralf Habacker  <ralf.habacker at freenet.de>
 
+	* dbus-win.patch: removed committed patches. 
+
+2007-03-10  Ralf Habacker  <ralf.habacker at 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,

Index: dbus-win.patch
===================================================================
RCS file: /cvs/dbus/dbus/dbus-win.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbus-win.patch	8 Mar 2007 20:33:31 -0000	1.9
+++ dbus-win.patch	10 Mar 2007 09:13:57 -0000	1.10
@@ -538,27 +538,6 @@
  
        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



More information about the dbus-commit mailing list