2 Index: bus/config-loader-expat.c
3 ===================================================================
4 RCS file: /cvs/dbus/dbus/bus/config-loader-expat.c,v
5 retrieving revision 1.10
6 diff -u -r1.10 config-loader-expat.c
7 --- bus/config-loader-expat.c 10 Aug 2004 03:06:59 -0000 1.10
8 +++ bus/config-loader-expat.c 8 Mar 2007 20:25:42 -0000
14 +DBusString *_dbus_get_working_dir(void);
18 bus_config_load (const DBusString *file,
22 BusConfigParser *parser;
24 + DBusString *dbusdir;
26 ExpatParseContext context;
34 + dbusdir = _dbus_get_working_dir();
36 + parser = bus_config_parser_new (dbusdir, is_toplevel, parent);
39 parser = bus_config_parser_new (&dirname, is_toplevel, parent);
42 Index: bus/config-loader-libxml.c
43 ===================================================================
44 RCS file: /cvs/dbus/dbus/bus/config-loader-libxml.c,v
45 retrieving revision 1.8
46 diff -u -r1.8 config-loader-libxml.c
47 --- bus/config-loader-libxml.c 10 Aug 2004 03:06:59 -0000 1.8
48 +++ bus/config-loader-libxml.c 8 Mar 2007 20:25:40 -0000
54 + DBusString *_dbus_get_working_dir(void);
58 bus_config_load (const DBusString *file,
60 DBusString dirname, data;
65 + DBusString *dbusdir;
67 _DBUS_ASSERT_ERROR_IS_CLEAR (error);
71 xmlSetGenericErrorFunc (NULL, xml_shut_up);
75 + dbusdir = _dbus_get_working_dir();
77 + parser = bus_config_parser_new (dbusdir, is_toplevel, parent);
80 if (!_dbus_string_get_dirname (file, &dirname))
82 _DBUS_SET_OOM (error);
86 parser = bus_config_parser_new (&dirname, is_toplevel, parent);
90 _DBUS_SET_OOM (error);
91 Index: bus/config-parser.c
92 ===================================================================
93 RCS file: /cvs/dbus/dbus/bus/config-parser.c,v
94 retrieving revision 1.47
95 diff -u -r1.47 config-parser.c
96 --- bus/config-parser.c 26 Jan 2007 16:10:09 -0000 1.47
97 +++ bus/config-parser.c 8 Mar 2007 20:25:40 -0000
98 @@ -3070,10 +3071,15 @@
100 static const char *test_service_dir_matches[] =
103 + DBUS_DATADIR"/dbus-1/services",
106 "/testusr/testlocal/testshare/dbus-1/services",
107 "/testusr/testshare/dbus-1/services",
108 DBUS_DATADIR"/dbus-1/services",
109 "/testhome/foo/.testlocal/testshare/dbus-1/services",
114 @@ -3082,11 +3088,32 @@
119 + const char *common_progs;
122 + common_progs = _dbus_getenv ("CommonProgramFiles");
125 + if (!_dbus_string_init (&progs))
128 + if (!_dbus_string_append (&progs, common_progs))
130 + _dbus_string_free (&progs);
134 + if (!_dbus_string_append (&progs, "/dbus-1/services"))
136 + _dbus_string_free (&progs);
139 + test_service_dir_matches[1] = _dbus_string_get_const_data(&progs);
143 - printf ("Testing retriving the default session service directories\n");
144 + printf ("Testing retrieving the default session service directories\n");
145 if (!_dbus_get_standard_session_servicedirs (&dirs))
146 _dbus_assert_not_reached ("couldn't get stardard dirs");
148 @@ -3097,7 +3124,7 @@
150 printf (" default service dir: %s\n", (char *)link->data);
151 _dbus_string_init_const (&path, (char *)link->data);
152 - if (!_dbus_string_ends_with_c_str (&path, "share/dbus-1/services"))
153 + if (!_dbus_string_ends_with_c_str (&path, "dbus-1/services"))
155 printf ("error with default session service directories\n");
157 @@ -3150,6 +3177,7 @@
161 + _dbus_string_free (&progs);
165 Index: bus/dispatch.c
166 ===================================================================
167 RCS file: /cvs/dbus/dbus/bus/dispatch.c,v
168 retrieving revision 1.79
169 diff -u -r1.79 dispatch.c
170 --- bus/dispatch.c 8 Mar 2007 08:30:17 -0000 1.79
171 +++ bus/dispatch.c 8 Mar 2007 20:25:42 -0000
174 #include <dbus/dbus-internals.h>
179 send_one_message (DBusConnection *connection,
186 +#include <tools/dbus-print-message.h>
187 +#include <tools/dbus-print-message.c>
191 spin_connection_until_authenticated (BusContext *context,
192 DBusConnection *connection)
194 bus_test_run_bus_loop (context, FALSE);
195 bus_test_run_clients_loop (FALSE);
198 + if ( dbus_connection_get_dispatch_status(connection) != DBUS_DISPATCH_COMPLETE)
200 + DBusMessage *message;
201 + message = dbus_connection_pop_message (connection);
202 + printf ("spin_connection_until_authenticated failed,\n");
203 + printf ("because of a non dispatched message:\n");
204 + print_message(message, FALSE);
206 + _dbus_assert_not_reached ("spin_connection_until_authenticated failed\n ");
210 _dbus_verbose (" ... done spinning to auth connection %p\n", connection);
213 @@ -2699,9 +2717,12 @@
217 +/* no DBUS_ERROR_NO_MEMORY on windows (no have_fork_errnum)*/
218 +#ifndef DBUS_WIN_FIXME
219 warn_unexpected (connection, message, "not this error");
226 @@ -2812,7 +2833,7 @@
232 #define TEST_ECHO_MESSAGE "Test echo message"
233 #define TEST_RUN_HELLO_FROM_SELF_MESSAGE "Test sending message to self"
235 @@ -4064,29 +4085,36 @@
236 _dbus_assert_not_reached ("initial connection setup failed");
239 +#ifdef DBUS_WIN_FIXME
240 + _dbus_warn("TODO: dispatch.c create_and_hello test\n");
242 check1_try_iterations (context, "create_and_hello",
243 check_hello_connection);
246 check2_try_iterations (context, foo, "nonexistent_service_no_auto_start",
247 check_nonexistent_service_no_auto_start);
249 -#ifdef DBUS_WIN_FIXME
250 +#ifdef DBUS_WIN_FIXME
251 _dbus_warn("TODO: dispatch.c segfault_service_no_auto_start test\n");
253 check2_try_iterations (context, foo, "segfault_service_no_auto_start",
254 check_segfault_service_no_auto_start);
257 +#ifdef DBUS_WIN_FIXME
258 + _dbus_warn("TODO: dispatch.c existent_service_no_auto_start\n");
260 check2_try_iterations (context, foo, "existent_service_no_auto_start",
261 check_existent_service_no_auto_start);
263 check2_try_iterations (context, foo, "nonexistent_service_auto_start",
264 check_nonexistent_service_auto_start);
268 #ifdef DBUS_WIN_FIXME
269 _dbus_warn("TODO: dispatch.c segfault_service_auto_start test\n");
272 check2_try_iterations (context, foo, "segfault_service_auto_start",
273 check_segfault_service_auto_start);
275 @@ -4106,8 +4134,12 @@
276 if (!check_existent_service_auto_start (context, foo))
277 _dbus_assert_not_reached ("existent service auto start failed");
279 +#ifdef DBUS_WIN_FIXME
280 + _dbus_warn("TODO: dispatch.c check_shell_service_success_auto_start test\n");
282 if (!check_shell_service_success_auto_start (context, foo))
283 _dbus_assert_not_reached ("shell success service auto start failed");
286 _dbus_verbose ("Disconnecting foo, bar, and baz\n");
288 @@ -4158,8 +4190,12 @@
289 _dbus_assert_not_reached ("initial connection setup failed");
292 +#ifdef DBUS_WIN_FIXME
293 + _dbus_warn("TODO: dispatch.c: create_and_hello_sha1 test\n");
295 check1_try_iterations (context, "create_and_hello_sha1",
296 check_hello_connection);
299 kill_client_connection_unchecked (foo);
302 ===================================================================
303 RCS file: /cvs/dbus/dbus/bus/main.c,v
304 retrieving revision 1.36
305 diff -u -r1.36 main.c
306 --- bus/main.c 20 Dec 2006 06:18:19 -0000 1.36
307 +++ bus/main.c 8 Mar 2007 20:25:40 -0000
309 dbus_bool_t print_pid;
313 + extern int _dbus_init_working_dir(char *s);
314 + if (!_dbus_init_working_dir(argv[0]))
318 if (!_dbus_string_init (&config_file))
322 ===================================================================
323 RCS file: /cvs/dbus/dbus/bus/policy.c,v
324 retrieving revision 1.24
325 diff -u -r1.24 policy.c
326 --- bus/policy.c 12 Dec 2006 21:24:07 -0000 1.24
327 +++ bus/policy.c 8 Mar 2007 20:25:40 -0000
330 if (!dbus_connection_get_unix_user (connection, &uid))
333 + _dbus_verbose ("policy.c: dbus_connection_get_unix_user check disabled under windows\n");
335 dbus_set_error (error, DBUS_ERROR_FAILED,
336 "No user ID known for connection, cannot determine security policy\n");
341 if (_dbus_hash_table_get_n_entries (policy->rules_by_uid) > 0)
342 Index: dbus/dbus-bus.c
343 ===================================================================
344 RCS file: /cvs/dbus/dbus/dbus/dbus-bus.c,v
345 retrieving revision 1.64
346 diff -u -r1.64 dbus-bus.c
347 --- dbus/dbus-bus.c 28 Oct 2006 01:41:37 -0000 1.64
348 +++ dbus/dbus-bus.c 8 Mar 2007 20:25:40 -0000
353 +#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
354 + // qt example pong says "QMutex::lock: Deadlock detected"
358 /* We are expecting to have the connection saved in only one of these
359 * slots, but someone could in a pathological case set system and session
360 * bus to the same bus or something. Or set one of them to the starter
365 +#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
370 static DBusConnection *
371 Index: dbus/dbus-connection.c
372 ===================================================================
373 RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
374 retrieving revision 1.154
375 diff -u -r1.154 dbus-connection.c
376 --- dbus/dbus-connection.c 15 Nov 2006 03:07:59 -0000 1.154
377 +++ dbus/dbus-connection.c 8 Mar 2007 20:25:37 -0000
378 @@ -4790,14 +4790,6 @@
379 _dbus_return_val_if_fail (connection != NULL, FALSE);
380 _dbus_return_val_if_fail (uid != NULL, FALSE);
383 - /* FIXME this should be done at a lower level, but it's kind of hard,
384 - * just want to be sure we don't ship with this API returning
385 - * some weird internal fake uid for 1.0
390 CONNECTION_LOCK (connection);
392 if (!_dbus_transport_get_is_authenticated (connection->transport))
393 @@ -4829,14 +4821,6 @@
394 _dbus_return_val_if_fail (connection != NULL, FALSE);
395 _dbus_return_val_if_fail (pid != NULL, FALSE);
398 - /* FIXME this should be done at a lower level, but it's kind of hard,
399 - * just want to be sure we don't ship with this API returning
400 - * some weird internal fake uid for 1.0
405 CONNECTION_LOCK (connection);
407 if (!_dbus_transport_get_is_authenticated (connection->transport))
408 Index: dbus/dbus-connection.h
409 ===================================================================
410 RCS file: /cvs/dbus/dbus/dbus/dbus-connection.h,v
411 retrieving revision 1.49
412 diff -u -r1.49 dbus-connection.h
413 --- dbus/dbus-connection.h 15 Nov 2006 03:07:59 -0000 1.49
414 +++ dbus/dbus-connection.h 8 Mar 2007 20:25:40 -0000
418 int dbus_watch_get_fd (DBusWatch *watch);
419 +#if defined (DBUS_COMPILATION)
420 +int dbus_watch_get_handle (DBusWatch *watch);
422 unsigned int dbus_watch_get_flags (DBusWatch *watch);
423 void* dbus_watch_get_data (DBusWatch *watch);
424 void dbus_watch_set_data (DBusWatch *watch,
425 Index: dbus/dbus-internals.c
426 ===================================================================
427 RCS file: /cvs/dbus/dbus/dbus/dbus-internals.c,v
428 retrieving revision 1.55
429 diff -u -r1.55 dbus-internals.c
430 --- dbus/dbus-internals.c 15 Nov 2006 01:52:01 -0000 1.55
431 +++ dbus/dbus-internals.c 8 Mar 2007 20:25:40 -0000
438 _dbus_verbose_init (void)
440 if (!verbose_initted)
441 Index: dbus/dbus-mainloop.c
442 ===================================================================
443 RCS file: /cvs/dbus/dbus/dbus/dbus-mainloop.c,v
444 retrieving revision 1.19
445 diff -u -r1.19 dbus-mainloop.c
446 --- dbus/dbus-mainloop.c 20 Oct 2006 03:04:59 -0000 1.19
447 +++ dbus/dbus-mainloop.c 8 Mar 2007 20:25:40 -0000
450 DBusTimeout *timeout;
451 DBusTimeoutFunction function;
452 - unsigned long last_tv_sec;
453 - unsigned long last_tv_usec;
458 #define WATCH_CALLBACK(callback) ((WatchCallback*)callback)
462 _dbus_verbose (" skipping watch on fd %d as it was out of memory last time\n",
463 - dbus_watch_get_fd (wcb->watch));
464 + dbus_watch_get_handle (wcb->watch));
467 else if (dbus_watch_get_enabled (wcb->watch))
470 flags = dbus_watch_get_flags (wcb->watch);
472 - fds[n_fds].fd = dbus_watch_get_fd (wcb->watch);
473 + fds[n_fds].fd = dbus_watch_get_handle (wcb->watch);
474 fds[n_fds].revents = 0;
475 fds[n_fds].events = 0;
476 if (flags & DBUS_WATCH_READABLE)
480 _dbus_verbose (" skipping disabled watch on fd %d %s\n",
481 - dbus_watch_get_fd (wcb->watch),
482 + dbus_watch_get_handle (wcb->watch),
483 watch_flags_to_string (dbus_watch_get_flags (wcb->watch)));
488 if (loop->timeout_count > 0)
490 - unsigned long tv_sec;
491 - unsigned long tv_usec;
495 _dbus_get_current_time (&tv_sec, &tv_usec);
499 if (loop->timeout_count > 0)
501 - unsigned long tv_sec;
502 - unsigned long tv_usec;
506 _dbus_get_current_time (&tv_sec, &tv_usec);
512 + _dbus_daemon_release ();
514 _dbus_verbose ("Quit main loop, depth %d -> %d\n",
515 loop->depth + 1, loop->depth);
517 Index: dbus/dbus-server-socket.c
518 ===================================================================
519 RCS file: /cvs/dbus/dbus/dbus/dbus-server-socket.c,v
520 retrieving revision 1.3
521 diff -u -r1.3 dbus-server-socket.c
522 --- dbus/dbus-server-socket.c 1 Oct 2006 15:36:18 -0000 1.3
523 +++ dbus/dbus-server-socket.c 8 Mar 2007 20:25:40 -0000
528 - listen_fd = dbus_watch_get_fd (watch);
529 + listen_fd = dbus_watch_get_handle (watch);
531 client_fd = _dbus_accept (listen_fd);
533 Index: dbus/dbus-server.c
534 ===================================================================
535 RCS file: /cvs/dbus/dbus/dbus/dbus-server.c,v
536 retrieving revision 1.54
537 diff -u -r1.54 dbus-server.c
538 --- dbus/dbus-server.c 21 Oct 2006 23:09:18 -0000 1.54
539 +++ dbus/dbus-server.c 8 Mar 2007 20:25:40 -0000
541 DBusServer **server_p,
544 - { _dbus_server_listen_socket },
545 - { _dbus_server_listen_platform_specific }
546 + { _dbus_server_listen_socket }
548 + , { _dbus_server_listen_platform_specific }
550 #ifdef DBUS_BUILD_TESTS
551 , { _dbus_server_listen_debug_pipe }
553 @@ -1114,6 +1116,13 @@
555 _dbus_server_test (void)
557 +#if defined(DBUS_WIN) || defined(DBUS_WINCE)
558 + const char *valid_addresses[] = {
560 + "tcp:host=localhost,port=1234",
561 + "tcp:host=localhost,port=1234;tcp:port=5678",
564 const char *valid_addresses[] = {
566 "unix:path=./boogie",
567 @@ -1121,7 +1130,7 @@
568 "tcp:host=localhost,port=1234;tcp:port=5678",
569 "tcp:port=1234;unix:path=./boogie",
576 Index: dbus/dbus-spawn.c
577 ===================================================================
578 RCS file: /cvs/dbus/dbus/dbus/dbus-spawn.c,v
579 retrieving revision 1.25
580 diff -u -r1.25 dbus-spawn.c
581 --- dbus/dbus-spawn.c 4 Mar 2007 19:14:03 -0000 1.25
582 +++ dbus/dbus-spawn.c 8 Mar 2007 20:25:40 -0000
584 if (condition & DBUS_WATCH_HANGUP)
585 revents |= _DBUS_POLLHUP;
587 - fd = dbus_watch_get_fd (watch);
588 + fd = dbus_watch_get_handle (watch);
590 if (fd == sitter->error_pipe_from_child)
591 handle_error_pipe (sitter, revents);
592 Index: dbus/dbus-sysdeps-util.c
593 ===================================================================
594 RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util.c,v
595 retrieving revision 1.10
596 diff -u -r1.10 dbus-sysdeps-util.c
597 --- dbus/dbus-sysdeps-util.c 13 Dec 2006 01:18:07 -0000 1.10
598 +++ dbus/dbus-sysdeps-util.c 8 Mar 2007 20:25:41 -0000
604 +#if defined(DBUS_WIN) || defined(DBUS_WINCE)
605 check_dirname ("foo\\bar", "foo");
606 check_dirname ("foo\\\\bar", "foo");
607 check_dirname ("foo/\\/bar", "foo");
612 +#ifndef DBUS_WIN_FIXME
613 _dbus_string_init_const (&str, "0xff");
614 if (!_dbus_string_parse_double (&str,
617 _dbus_warn ("_dbus_string_parse_double of \"0xff\" returned wrong position %d", pos);
623 check_path_absolute ("c:/", TRUE);
624 check_path_absolute ("c:/foo", TRUE);
625 Index: dbus/dbus-sysdeps.c
626 ===================================================================
627 RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
628 retrieving revision 1.120
629 diff -u -r1.120 dbus-sysdeps.c
630 --- dbus/dbus-sysdeps.c 1 Jan 2007 21:29:59 -0000 1.120
631 +++ dbus/dbus-sysdeps.c 8 Mar 2007 20:25:41 -0000
632 @@ -119,11 +119,14 @@
633 * will get upset about.
636 - putenv_value = malloc (len + 1);
637 + putenv_value = malloc (len + 2);
638 if (putenv_value == NULL)
641 strcpy (putenv_value, varname);
642 +#if defined(DBUS_WIN)
643 + strcat (putenv_value, "=");
646 return (putenv (putenv_value) == 0);
649 ascii_strtod (const char *nptr,
652 + /* FIXME: The Win32 C library's strtod() doesn't handle hex.
653 + * Presumably many Unixes don't either.
658 struct lconv *locale_data;
659 Index: dbus/dbus-sysdeps.h
660 ===================================================================
661 RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.h,v
662 retrieving revision 1.69
663 diff -u -r1.69 dbus-sysdeps.h
664 --- dbus/dbus-sysdeps.h 8 Mar 2007 20:25:15 -0000 1.69
665 +++ dbus/dbus-sysdeps.h 8 Mar 2007 20:25:41 -0000
670 +void _dbus_daemon_release (void);
671 dbus_bool_t _dbus_open_tcp_socket (int *fd,
673 dbus_bool_t _dbus_close_socket (int fd,
674 Index: dbus/dbus-test.c
675 ===================================================================
676 RCS file: /cvs/dbus/dbus/dbus/dbus-test.c,v
677 retrieving revision 1.44
678 diff -u -r1.44 dbus-test.c
679 --- dbus/dbus-test.c 15 Nov 2006 03:07:59 -0000 1.44
680 +++ dbus/dbus-test.c 8 Mar 2007 20:25:41 -0000
683 run_test ("hash", specific_test, _dbus_hash_test);
685 +#if !defined(DBUS_WINCE)
686 run_data_test ("spawn", specific_test, _dbus_spawn_test, test_data_dir);
689 run_data_test ("userdb", specific_test, _dbus_userdb_test, test_data_dir);
691 Index: dbus/dbus-threads.c
692 ===================================================================
693 RCS file: /cvs/dbus/dbus/dbus/dbus-threads.c,v
694 retrieving revision 1.36
695 diff -u -r1.36 dbus-threads.c
696 --- dbus/dbus-threads.c 28 Oct 2006 01:41:37 -0000 1.36
697 +++ dbus/dbus-threads.c 8 Mar 2007 20:25:41 -0000
700 _dbus_threads_init_debug (void)
702 +#if defined(DBUS_WIN)
703 + return _dbus_threads_init_platform_specific();
705 return dbus_threads_init (&fake_functions);
709 #endif /* DBUS_BUILD_TESTS */
710 Index: dbus/dbus-transport-socket.h
711 ===================================================================
712 RCS file: /cvs/dbus/dbus/dbus/dbus-transport-socket.h,v
713 retrieving revision 1.2
714 diff -u -r1.2 dbus-transport-socket.h
715 --- dbus/dbus-transport-socket.h 16 Sep 2006 19:24:08 -0000 1.2
716 +++ dbus/dbus-transport-socket.h 8 Mar 2007 20:25:42 -0000
719 #include <dbus/dbus-transport-protected.h>
721 +#if defined(DBUS_WIN)
722 +#include <dbus/dbus-sockets-win.h>
727 DBusTransport* _dbus_transport_new_for_socket (int fd,
728 Index: dbus/dbus-transport.c
729 ===================================================================
730 RCS file: /cvs/dbus/dbus/dbus/dbus-transport.c,v
731 retrieving revision 1.54
732 diff -u -r1.54 dbus-transport.c
733 --- dbus/dbus-transport.c 17 Oct 2006 20:52:13 -0000 1.54
734 +++ dbus/dbus-transport.c 8 Mar 2007 20:25:42 -0000
736 DBusTransport **transport_p,
739 - { _dbus_transport_open_socket },
740 - { _dbus_transport_open_platform_specific },
741 - { _dbus_transport_open_autolaunch }
742 + { _dbus_transport_open_socket }
744 + , { _dbus_transport_open_platform_specific }
746 + , { _dbus_transport_open_autolaunch }
747 #ifdef DBUS_BUILD_TESTS
748 , { _dbus_transport_open_debug_pipe }
751 if (transport->disconnected)
754 - if (dbus_watch_get_fd (watch) < 0)
755 + if (dbus_watch_get_handle (watch) < 0)
757 _dbus_warn_check_failed ("Tried to handle an invalidated watch; this watch should have been removed\n");
759 Index: dbus/dbus-watch.c
760 ===================================================================
761 RCS file: /cvs/dbus/dbus/dbus/dbus-watch.c,v
762 retrieving revision 1.22
763 diff -u -r1.22 dbus-watch.c
764 --- dbus/dbus-watch.c 21 Oct 2006 21:57:31 -0000 1.22
765 +++ dbus/dbus-watch.c 8 Mar 2007 20:25:42 -0000
768 _dbus_verbose ("Adding a %s watch on fd %d using newly-set add watch function\n",
770 - dbus_watch_get_fd (link->data));
771 + dbus_watch_get_handle (link->data));
773 #endif /* DBUS_ENABLE_VERBOSE_MODE */
778 _dbus_verbose ("Removing watch on fd %d using newly-set remove function because initial add failed\n",
779 - dbus_watch_get_fd (link2->data));
780 + dbus_watch_get_handle (link2->data));
782 (* remove_function) (link2->data, data);
785 if (watch_list->add_watch_function != NULL)
787 _dbus_verbose ("Adding watch on fd %d\n",
788 - dbus_watch_get_fd (watch));
789 + dbus_watch_get_handle (watch));
791 if (!(* watch_list->add_watch_function) (watch,
792 watch_list->watch_data))
794 if (watch_list->remove_watch_function != NULL)
796 _dbus_verbose ("Removing watch on fd %d\n",
797 - dbus_watch_get_fd (watch));
798 + dbus_watch_get_handle (watch));
800 (* watch_list->remove_watch_function) (watch,
801 watch_list->watch_data);
803 if (watch_list->watch_toggled_function != NULL)
805 _dbus_verbose ("Toggling watch %p on fd %d to %d\n",
806 - watch, dbus_watch_get_fd (watch), watch->enabled);
807 + watch, dbus_watch_get_handle (watch), watch->enabled);
809 (* watch_list->watch_toggled_function) (watch,
810 watch_list->watch_data);
811 @@ -490,10 +490,32 @@
812 * @returns the file descriptor to watch.
815 +dbus_watch_get_handle (DBusWatch *watch)
820 +#if defined(DBUS_WIN)
821 +// never used by the dbus code
822 +#include "dbus-sysdeps-win.h"
824 +dbus_watch_get_fd (DBusWatch *watch)
827 + if (watch->fd != -1) {
828 + _dbus_handle_to_socket(watch->fd,&p);
836 dbus_watch_get_fd (DBusWatch *watch)
843 * Gets flags from DBusWatchFlags indicating
845 DBusFreeFunction free_data_function)
847 _dbus_verbose ("Setting watch fd %d data to data = %p function = %p from data = %p function = %p\n",
848 - dbus_watch_get_fd (watch),
849 + dbus_watch_get_handle (watch),
850 data, free_data_function, watch->data, watch->free_data_function);
852 if (watch->free_data_function != NULL)