From 47d9968dcc65720dbc1c04d008704ec161562803 Mon Sep 17 00:00:00 2001 From: Andreas Volz Date: Tue, 29 Jul 2008 13:01:43 +0200 Subject: [PATCH] changed config*.h include path --- README | 6 +++++- examples/glib/dbus-browser.cpp | 4 ++++ examples/hal/hal-listen.cpp | 4 ++++ examples/properties/props-server.cpp | 4 ++++ include/dbus-c++/connection.h | 4 +--- include/dbus-c++/debug.h | 4 +--- include/dbus-c++/dispatcher.h | 5 +---- include/dbus-c++/ecore-integration.h | 5 +---- include/dbus-c++/error.h | 5 +---- include/dbus-c++/eventloop-integration.h | 5 +---- include/dbus-c++/eventloop.h | 4 +--- include/dbus-c++/glib-integration.h | 5 +---- include/dbus-c++/interface.h | 4 +--- include/dbus-c++/introspection.h | 4 +--- include/dbus-c++/message.h | 4 +--- include/dbus-c++/object.h | 4 +--- include/dbus-c++/pendingcall.h | 4 +--- include/dbus-c++/property.h | 4 +--- include/dbus-c++/refptr_impl.h | 4 +--- include/dbus-c++/server.h | 4 +--- include/dbus-c++/types.h | 4 +--- include/dbus-c++/util.h | 4 +--- src/connection.cpp | 4 ++-- src/connection_p.h | 2 -- src/debug.cpp | 2 -- src/dispatcher.cpp | 2 -- src/dispatcher_p.h | 2 -- src/ecore-integration.cpp | 17 +++++++---------- src/error.cpp | 2 -- src/eventloop-integration.cpp | 2 -- src/eventloop.cpp | 2 -- src/glib-integration.cpp | 3 --- src/interface.cpp | 2 -- src/internalerror.h | 2 -- src/introspection.cpp | 2 -- src/message.cpp | 2 -- src/message_p.h | 2 -- src/object.cpp | 2 -- src/pendingcall.cpp | 2 -- src/pendingcall_p.h | 2 -- src/property.cpp | 2 -- src/server.cpp | 2 -- src/server_p.h | 2 -- src/types.cpp | 2 -- 44 files changed, 44 insertions(+), 113 deletions(-) diff --git a/README b/README index 9782e0a..37e50e4 100644 --- a/README +++ b/README @@ -1,4 +1,8 @@ Debugging --------- -To compile debugging code configure the project with the --enable-debug option. Then at runtime you may set the environment variable DBUSXX_VERBOSE to '1' to activate debugging and to '0' to deactivate debugging. +To compile debugging code configure the project with the --enable-debug option. Then at runtime you may set the environment variable "DBUSXX_VERBOSE=1" to activate debugging and to '0' to deactivate debugging. + +Hints +----- +Your applications based on dbus-c++ have to support PTHREAD and to export the variable HAVE_PTHREAD_H. This is a work in progress and my change. diff --git a/examples/glib/dbus-browser.cpp b/examples/glib/dbus-browser.cpp index cd74d70..09ec119 100644 --- a/examples/glib/dbus-browser.cpp +++ b/examples/glib/dbus-browser.cpp @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "dbus-browser.h" #include diff --git a/examples/hal/hal-listen.cpp b/examples/hal/hal-listen.cpp index d36eb2a..3d1262a 100644 --- a/examples/hal/hal-listen.cpp +++ b/examples/hal/hal-listen.cpp @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "hal-listen.h" #include diff --git a/examples/properties/props-server.cpp b/examples/properties/props-server.cpp index 6a4495f..a5f72c6 100644 --- a/examples/properties/props-server.cpp +++ b/examples/properties/props-server.cpp @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "props-server.h" #include diff --git a/include/dbus-c++/connection.h b/include/dbus-c++/connection.h index d386ff9..90e660d 100644 --- a/include/dbus-c++/connection.h +++ b/include/dbus-c++/connection.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_CONNECTION_H #define __DBUSXX_CONNECTION_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include diff --git a/include/dbus-c++/debug.h b/include/dbus-c++/debug.h index 8c17371..0daeb9d 100644 --- a/include/dbus-c++/debug.h +++ b/include/dbus-c++/debug.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_DEBUG_H #define __DBUSXX_DEBUG_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include "api.h" diff --git a/include/dbus-c++/dispatcher.h b/include/dbus-c++/dispatcher.h index 67ad979..9567a79 100644 --- a/include/dbus-c++/dispatcher.h +++ b/include/dbus-c++/dispatcher.h @@ -25,10 +25,7 @@ #ifndef __DBUSXX_DISPATCHER_H #define __DBUSXX_DISPATCHER_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif - +#include "dbus-c++-config.h" #include "api.h" #include "connection.h" #include "eventloop.h" diff --git a/include/dbus-c++/ecore-integration.h b/include/dbus-c++/ecore-integration.h index 5426b76..e873b8e 100644 --- a/include/dbus-c++/ecore-integration.h +++ b/include/dbus-c++/ecore-integration.h @@ -25,10 +25,7 @@ #ifndef __DBUSXX_ECORE_INTEGRATION_H #define __DBUSXX_ECORE_INTEGRATION_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif - +#include "dbus-c++-config.h" #include #include "api.h" diff --git a/include/dbus-c++/error.h b/include/dbus-c++/error.h index 8a9563d..f4ff416 100644 --- a/include/dbus-c++/error.h +++ b/include/dbus-c++/error.h @@ -25,10 +25,7 @@ #ifndef __DBUSXX_ERROR_H #define __DBUSXX_ERROR_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif - +#include "dbus-c++-config.h" #include "api.h" #include "util.h" diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h index b01bb01..0b3f3a8 100644 --- a/include/dbus-c++/eventloop-integration.h +++ b/include/dbus-c++/eventloop-integration.h @@ -25,10 +25,7 @@ #ifndef __DBUSXX_EVENTLOOP_INTEGRATION_H #define __DBUSXX_EVENTLOOP_INTEGRATION_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif - +#include "dbus-c++-config.h" #include "api.h" #include "dispatcher.h" #include "util.h" diff --git a/include/dbus-c++/eventloop.h b/include/dbus-c++/eventloop.h index 20e2cb8..90e77cf 100644 --- a/include/dbus-c++/eventloop.h +++ b/include/dbus-c++/eventloop.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_EVENTLOOP_H #define __DBUSXX_EVENTLOOP_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #ifdef HAVE_PTHREAD_H #include diff --git a/include/dbus-c++/glib-integration.h b/include/dbus-c++/glib-integration.h index a4ab5f4..a5e8bba 100644 --- a/include/dbus-c++/glib-integration.h +++ b/include/dbus-c++/glib-integration.h @@ -25,10 +25,7 @@ #ifndef __DBUSXX_GLIB_INTEGRATION_H #define __DBUSXX_GLIB_INTEGRATION_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif - +#include "dbus-c++-config.h" #include #include "api.h" diff --git a/include/dbus-c++/interface.h b/include/dbus-c++/interface.h index 5c0a902..faf6da6 100644 --- a/include/dbus-c++/interface.h +++ b/include/dbus-c++/interface.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_INTERFACE_H #define __DBUSXX_INTERFACE_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include #include diff --git a/include/dbus-c++/introspection.h b/include/dbus-c++/introspection.h index 33da8e9..51a9003 100644 --- a/include/dbus-c++/introspection.h +++ b/include/dbus-c++/introspection.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_INTROSPECTION_H #define __DBUSXX_INTROSPECTION_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include "api.h" #include "interface.h" diff --git a/include/dbus-c++/message.h b/include/dbus-c++/message.h index 6eaf700..082a402 100644 --- a/include/dbus-c++/message.h +++ b/include/dbus-c++/message.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_MESSAGE_H #define __DBUSXX_MESSAGE_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include #include diff --git a/include/dbus-c++/object.h b/include/dbus-c++/object.h index 7ebc45d..033fc3d 100644 --- a/include/dbus-c++/object.h +++ b/include/dbus-c++/object.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_OBJECT_H #define __DBUSXX_OBJECT_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include #include diff --git a/include/dbus-c++/pendingcall.h b/include/dbus-c++/pendingcall.h index f342b8e..c7044df 100644 --- a/include/dbus-c++/pendingcall.h +++ b/include/dbus-c++/pendingcall.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_PENDING_CALL_H #define __DBUSXX_PENDING_CALL_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include "api.h" #include "util.h" diff --git a/include/dbus-c++/property.h b/include/dbus-c++/property.h index 669c079..60a997f 100644 --- a/include/dbus-c++/property.h +++ b/include/dbus-c++/property.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_PROPERTY_H #define __DBUSXX_PROPERTY_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include "api.h" #include "types.h" diff --git a/include/dbus-c++/refptr_impl.h b/include/dbus-c++/refptr_impl.h index ed98770..8d1a593 100644 --- a/include/dbus-c++/refptr_impl.h +++ b/include/dbus-c++/refptr_impl.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_REFPTR_IMPL_H #define __DBUSXX_REFPTR_IMPL_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include "api.h" #include "util.h" diff --git a/include/dbus-c++/server.h b/include/dbus-c++/server.h index f60de6b..9115fa9 100644 --- a/include/dbus-c++/server.h +++ b/include/dbus-c++/server.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_SERVER_H #define __DBUSXX_SERVER_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include diff --git a/include/dbus-c++/types.h b/include/dbus-c++/types.h index 2051fc3..8e617aa 100644 --- a/include/dbus-c++/types.h +++ b/include/dbus-c++/types.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_TYPES_H #define __DBUSXX_TYPES_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include #include diff --git a/include/dbus-c++/util.h b/include/dbus-c++/util.h index 9d86ea8..e95d352 100644 --- a/include/dbus-c++/util.h +++ b/include/dbus-c++/util.h @@ -25,9 +25,7 @@ #ifndef __DBUSXX_UTIL_H #define __DBUSXX_UTIL_H -#ifdef HAVE_DBUSPP_CONFIG_H -#include -#endif +#include "dbus-c++-config.h" #include "api.h" #include "debug.h" diff --git a/src/connection.cpp b/src/connection.cpp index d56b69e..16d951f 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -24,9 +24,9 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H + #include -#endif + #include #include diff --git a/src/connection_p.h b/src/connection_p.h index 1bb5fc6..3b9b665 100644 --- a/src/connection_p.h +++ b/src/connection_p.h @@ -28,9 +28,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/debug.cpp b/src/debug.cpp index 33ab2f4..e83369b 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 08ee54a..1ac1f64 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include diff --git a/src/dispatcher_p.h b/src/dispatcher_p.h index 340ae93..ac4c9ff 100644 --- a/src/dispatcher_p.h +++ b/src/dispatcher_p.h @@ -28,9 +28,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include diff --git a/src/ecore-integration.cpp b/src/ecore-integration.cpp index 65ae2d7..7c1d655 100644 --- a/src/ecore-integration.cpp +++ b/src/ecore-integration.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include @@ -80,9 +78,8 @@ void Ecore::BusTimeout::_enable() void Ecore::BusTimeout::_disable() { - // TODO: port debug_log("Ecore::BusTimeout::_disable()"); - // need to enhance Dispatcher with close + ecore_timer_del (_etimer); //g_source_destroy(_source); } @@ -96,7 +93,7 @@ struct BusSource static bool watch_prepare( /*GSource *source,*/ int *timeout ) { -// debug_log("ecore: watch_prepare"); + debug_log("ecore: watch_prepare"); *timeout = -1; return false; @@ -104,10 +101,10 @@ static bool watch_prepare( /*GSource *source,*/ int *timeout ) static bool watch_check( /*GSource *source*/ ) { -// debug_log("ecore: watch_check"); + debug_log("ecore: watch_check"); //BusSource* io = (BusSource*)source; - return 0;//io->poll.revents ? true : false; + return true;//io->poll.revents ? true : false; } // TODO: port parameters @@ -115,9 +112,9 @@ static bool watch_dispatch(/* GSource *source, GSourceFunc callback, */void *dat { debug_log("ecore: watch_dispatch"); - /*bool cb = callback(data); - DBus::default_dispatcher->dispatch_pending(); //TODO: won't work in case of multiple dispatchers*/ - return 1;//cb; + bool cb = true;//callback(data); + DBus::default_dispatcher->dispatch_pending(); //TODO: won't work in case of multiple dispatchers + return cb; } // TODO: needed? diff --git a/src/error.cpp b/src/error.cpp index 7147d04..c08c697 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp index 846b6e9..b3ef2bb 100644 --- a/src/eventloop-integration.cpp +++ b/src/eventloop-integration.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/eventloop.cpp b/src/eventloop.cpp index eb870fa..94cdee5 100644 --- a/src/eventloop.cpp +++ b/src/eventloop.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/glib-integration.cpp b/src/glib-integration.cpp index bb6a144..840aa52 100644 --- a/src/glib-integration.cpp +++ b/src/glib-integration.cpp @@ -24,10 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif - #include #include // for DBUS_WATCH_* diff --git a/src/interface.cpp b/src/interface.cpp index 597e7a3..e765523 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/internalerror.h b/src/internalerror.h index 1bf9c59..7a6bbe0 100644 --- a/src/internalerror.h +++ b/src/internalerror.h @@ -28,9 +28,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include diff --git a/src/introspection.cpp b/src/introspection.cpp index b5e794e..7137964 100644 --- a/src/introspection.cpp +++ b/src/introspection.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/message.cpp b/src/message.cpp index 88e04f2..1c4fb9c 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include diff --git a/src/message_p.h b/src/message_p.h index 405b9a6..404847b 100644 --- a/src/message_p.h +++ b/src/message_p.h @@ -28,9 +28,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/object.cpp b/src/object.cpp index 58fdab3..cf4be24 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/pendingcall.cpp b/src/pendingcall.cpp index ceb7700..482bcfd 100644 --- a/src/pendingcall.cpp +++ b/src/pendingcall.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include diff --git a/src/pendingcall_p.h b/src/pendingcall_p.h index a12f81c..90efdf1 100644 --- a/src/pendingcall_p.h +++ b/src/pendingcall_p.h @@ -28,9 +28,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/property.cpp b/src/property.cpp index 83eeaf5..6c17d44 100644 --- a/src/property.cpp +++ b/src/property.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/server.cpp b/src/server.cpp index 1a8a21c..1882d70 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/server_p.h b/src/server_p.h index 6dae318..8c83750 100644 --- a/src/server_p.h +++ b/src/server_p.h @@ -28,9 +28,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include diff --git a/src/types.cpp b/src/types.cpp index dafd04e..b2c3543 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -24,9 +24,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#ifdef HAVE_DBUSPP_CONFIG_H #include -#endif #include #include