diff --git a/include/dbus-c++/pendingcall.h b/include/dbus-c++/pendingcall.h index a2c9526..48a6bbf 100644 --- a/include/dbus-c++/pendingcall.h +++ b/include/dbus-c++/pendingcall.h @@ -93,7 +93,7 @@ public: * \param data The data to store. * \throw ErrorNoMemory */ - void data( void* ); + void data( void* data ); /*! * \brief Retrieves data previously set with dbus_pending_call_set_data(). diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 807a2db..58aacca 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -71,7 +71,7 @@ Watch::Watch( Watch::Internal* i ) int Watch::descriptor() const { #if HAVE_WIN32 - return dbus_watch_get_socket((DBusWatch*)_int); + return dbus_watch_get_socket((DBusWatch*)_int); #else return dbus_watch_get_unix_fd((DBusWatch*)_int); #endif diff --git a/src/ecore-integration.cpp b/src/ecore-integration.cpp index 61646c0..f65168e 100644 --- a/src/ecore-integration.cpp +++ b/src/ecore-integration.cpp @@ -152,6 +152,8 @@ int Ecore::BusWatch::watch_handler_read( void *data, Ecore_Fd_Handler *fdh ) debug_log("ecore: watch_handler_read"); int flags = DBUS_WATCH_READABLE; + + watch_dispatch(NULL);// test w->handle(flags); @@ -175,7 +177,7 @@ void Ecore::BusWatch::_enable() { debug_log("Ecore::BusWatch::_enable()"); - //int flags = Watch::flags(); + int flags = Watch::flags(); //Ecore_Fd_Handler_Flags condition = ECORE_FD_READ; // TODO: create second handler for ECORE_FD_ERROR case