* removed obsolate patches

2 files changed, 4 insertions, 232 deletions

diff --git a/ChangeLog b/ChangeLog
index 76df08b4..749d4e47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-18  Ralf Habacker  <ralf.habacker@freenet.de>
+
+	* dbus-win.patch: removed obsolate patches
+
 2007-06-18  Havoc Pennington  <hp@redhat.com>
 
 	* configure.in: bump version to 1.1.2 so CVS is higher than last
diff --git a/dbus-win.patch b/dbus-win.patch
index 6ac028ae..715267f1 100644
--- a/dbus-win.patch
+++ b/dbus-win.patch
@@ -145,60 +145,6 @@ diff -u -r1.64 dbus-bus.c
  }
  
  static DBusConnection *
-Index: dbus/dbus-connection.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
-retrieving revision 1.154
-diff -u -r1.154 dbus-connection.c
---- dbus/dbus-connection.c	15 Nov 2006 03:07:59 -0000	1.154
-+++ dbus/dbus-connection.c	8 Mar 2007 20:25:37 -0000
-@@ -4790,14 +4790,6 @@
-   _dbus_return_val_if_fail (connection != NULL, FALSE);
-   _dbus_return_val_if_fail (uid != NULL, FALSE);
- 
--#ifdef DBUS_WIN
--  /* FIXME this should be done at a lower level, but it's kind of hard,
--   * just want to be sure we don't ship with this API returning
--   * some weird internal fake uid for 1.0
--   */
--  return FALSE;
--#endif
--  
-   CONNECTION_LOCK (connection);
- 
-   if (!_dbus_transport_get_is_authenticated (connection->transport))
-@@ -4829,14 +4821,6 @@
-   _dbus_return_val_if_fail (connection != NULL, FALSE);
-   _dbus_return_val_if_fail (pid != NULL, FALSE);
- 
--#ifdef DBUS_WIN
--  /* FIXME this should be done at a lower level, but it's kind of hard,
--   * just want to be sure we don't ship with this API returning
--   * some weird internal fake uid for 1.0
--   */
--  return FALSE;
--#endif
--  
-   CONNECTION_LOCK (connection);
- 
-   if (!_dbus_transport_get_is_authenticated (connection->transport))
-Index: dbus/dbus-connection.h
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-connection.h,v
-retrieving revision 1.49
-diff -u -r1.49 dbus-connection.h
---- dbus/dbus-connection.h	15 Nov 2006 03:07:59 -0000	1.49
-+++ dbus/dbus-connection.h	8 Mar 2007 20:25:40 -0000
-@@ -330,6 +330,9 @@
-  */
- 
- int          dbus_watch_get_fd      (DBusWatch        *watch);
-+#if defined (DBUS_COMPILATION)
-+int          dbus_watch_get_handle  (DBusWatch        *watch);
-+#endif
- unsigned int dbus_watch_get_flags   (DBusWatch        *watch);
- void*        dbus_watch_get_data    (DBusWatch        *watch);
- void         dbus_watch_set_data    (DBusWatch        *watch,
 Index: dbus/dbus-mainloop.c
 ===================================================================
 RCS file: /cvs/dbus/dbus/dbus/dbus-mainloop.c,v
@@ -206,33 +152,6 @@ retrieving revision 1.19
 diff -u -r1.19 dbus-mainloop.c
 --- dbus/dbus-mainloop.c	20 Oct 2006 03:04:59 -0000	1.19
 +++ dbus/dbus-mainloop.c	8 Mar 2007 20:25:40 -0000
-@@ -598,7 +598,7 @@
- 
- #if MAINLOOP_SPEW
-               _dbus_verbose ("  skipping watch on fd %d as it was out of memory last time\n",
--                             dbus_watch_get_fd (wcb->watch));
-+                             dbus_watch_get_handle (wcb->watch));
- #endif
-             }
-           else if (dbus_watch_get_enabled (wcb->watch))
-@@ -609,7 +609,7 @@
-                   
-               flags = dbus_watch_get_flags (wcb->watch);
-                   
--              fds[n_fds].fd = dbus_watch_get_fd (wcb->watch);
-+              fds[n_fds].fd = dbus_watch_get_handle (wcb->watch);
-               fds[n_fds].revents = 0;
-               fds[n_fds].events = 0;
-               if (flags & DBUS_WATCH_READABLE)
-@@ -628,7 +628,7 @@
-             {
- #if MAINLOOP_SPEW
-               _dbus_verbose ("  skipping disabled watch on fd %d  %s\n",
--                             dbus_watch_get_fd (wcb->watch),
-+                             dbus_watch_get_handle (wcb->watch),
-                              watch_flags_to_string (dbus_watch_get_flags (wcb->watch)));
- #endif
-             }
 @@ -883,6 +883,8 @@
    
    loop->depth -= 1;
@@ -242,38 +161,6 @@ diff -u -r1.19 dbus-mainloop.c
    _dbus_verbose ("Quit main loop, depth %d -> %d\n",
                   loop->depth + 1, loop->depth);
  }
-Index: dbus/dbus-server-socket.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-server-socket.c,v
-retrieving revision 1.3
-diff -u -r1.3 dbus-server-socket.c
---- dbus/dbus-server-socket.c	1 Oct 2006 15:36:18 -0000	1.3
-+++ dbus/dbus-server-socket.c	8 Mar 2007 20:25:40 -0000
-@@ -161,7 +161,7 @@
-       int client_fd;
-       int listen_fd;
-       
--      listen_fd = dbus_watch_get_fd (watch);
-+      listen_fd = dbus_watch_get_handle (watch);
- 
-       client_fd = _dbus_accept (listen_fd);
-       
-Index: dbus/dbus-spawn.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-spawn.c,v
-retrieving revision 1.25
-diff -u -r1.25 dbus-spawn.c
---- dbus/dbus-spawn.c	4 Mar 2007 19:14:03 -0000	1.25
-+++ dbus/dbus-spawn.c	8 Mar 2007 20:25:40 -0000
-@@ -720,7 +720,7 @@
-   if (condition & DBUS_WATCH_HANGUP)
-     revents |= _DBUS_POLLHUP;
- 
--  fd = dbus_watch_get_fd (watch);
-+  fd = dbus_watch_get_handle (watch);
- 
-   if (fd == sitter->error_pipe_from_child)
-     handle_error_pipe (sitter, revents);
 Index: dbus/dbus-sysdeps-util.c
 ===================================================================
 RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util.c,v
@@ -281,15 +168,6 @@ retrieving revision 1.10
 diff -u -r1.10 dbus-sysdeps-util.c
 --- dbus/dbus-sysdeps-util.c	13 Dec 2006 01:18:07 -0000	1.10
 +++ dbus/dbus-sysdeps-util.c	8 Mar 2007 20:25:41 -0000
-@@ -82,7 +82,7 @@
-   double val;
-   int pos;
- 
--#ifdef DBUS_WIN
-+#if defined(DBUS_WIN) || defined(DBUS_WINCE)
-   check_dirname ("foo\\bar", "foo");
-   check_dirname ("foo\\\\bar", "foo");
-   check_dirname ("foo/\\/bar", "foo");
 @@ -141,6 +141,7 @@
        exit (1);
      }
@@ -341,113 +219,3 @@ diff -u -r1.36 dbus-threads.c
  }
  
  #endif /* DBUS_BUILD_TESTS */
-Index: dbus/dbus-transport.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-transport.c,v
-retrieving revision 1.54
-diff -u -r1.54 dbus-transport.c
---- dbus/dbus-transport.c	17 Oct 2006 20:52:13 -0000	1.54
-+++ dbus/dbus-transport.c	8 Mar 2007 20:25:42 -0000
-@@ -674,7 +676,7 @@
-   if (transport->disconnected)
-     return TRUE;
- 
--  if (dbus_watch_get_fd (watch) < 0)
-+  if (dbus_watch_get_handle (watch) < 0)
-     {
-       _dbus_warn_check_failed ("Tried to handle an invalidated watch; this watch should have been removed\n");
-       return TRUE;
-Index: dbus/dbus-watch.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-watch.c,v
-retrieving revision 1.22
-diff -u -r1.22 dbus-watch.c
---- dbus/dbus-watch.c	21 Oct 2006 21:57:31 -0000	1.22
-+++ dbus/dbus-watch.c	8 Mar 2007 20:25:42 -0000
-@@ -286,7 +286,7 @@
-             
-             _dbus_verbose ("Adding a %s watch on fd %d using newly-set add watch function\n",
-                            watch_type,
--                           dbus_watch_get_fd (link->data));
-+                           dbus_watch_get_handle (link->data));
-           }
- #endif /* DBUS_ENABLE_VERBOSE_MODE */
-           
-@@ -302,7 +302,7 @@
-                                                              link2);
-                   
-                   _dbus_verbose ("Removing watch on fd %d using newly-set remove function because initial add failed\n",
--                                 dbus_watch_get_fd (link2->data));
-+                                 dbus_watch_get_handle (link2->data));
-                   
-                   (* remove_function) (link2->data, data);
-                   
-@@ -359,7 +359,7 @@
-   if (watch_list->add_watch_function != NULL)
-     {
-       _dbus_verbose ("Adding watch on fd %d\n",
--                     dbus_watch_get_fd (watch));
-+                     dbus_watch_get_handle (watch));
-       
-       if (!(* watch_list->add_watch_function) (watch,
-                                                watch_list->watch_data))
-@@ -390,7 +390,7 @@
-   if (watch_list->remove_watch_function != NULL)
-     {
-       _dbus_verbose ("Removing watch on fd %d\n",
--                     dbus_watch_get_fd (watch));
-+                     dbus_watch_get_handle (watch));
-       
-       (* watch_list->remove_watch_function) (watch,
-                                              watch_list->watch_data);
-@@ -422,7 +422,7 @@
-   if (watch_list->watch_toggled_function != NULL)
-     {
-       _dbus_verbose ("Toggling watch %p on fd %d to %d\n",
--                     watch, dbus_watch_get_fd (watch), watch->enabled);
-+                     watch, dbus_watch_get_handle (watch), watch->enabled);
-       
-       (* watch_list->watch_toggled_function) (watch,
-                                               watch_list->watch_data);
-@@ -490,10 +490,32 @@
-  * @returns the file descriptor to watch.
-  */
- int
-+dbus_watch_get_handle (DBusWatch *watch)
-+{
-+  return watch->fd;
-+}
-+
-+#if defined(DBUS_WIN)
-+// never used by the dbus code
-+#include "dbus-sysdeps-win.h"
-+int 
-+dbus_watch_get_fd (DBusWatch *watch)
-+{
-+	DBusSocket *p;
-+	if (watch->fd != -1) {
-+	    _dbus_handle_to_socket(watch->fd,&p);
-+	    return p->fd;
-+	}
-+	else
-+		return -1;
-+}
-+#else
-+int
- dbus_watch_get_fd (DBusWatch *watch)
- {
-   return watch->fd;
- }
-+#endif
- 
- /**
-  * Gets flags from DBusWatchFlags indicating
-@@ -546,7 +568,7 @@
-                      DBusFreeFunction  free_data_function)
- {
-   _dbus_verbose ("Setting watch fd %d data to data = %p function = %p from data = %p function = %p\n",
--                 dbus_watch_get_fd (watch),
-+                 dbus_watch_get_handle (watch),
-                  data, free_data_function, watch->data, watch->free_data_function);
-   
-   if (watch->free_data_function != NULL)