jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

changed config*.h include path

Browse source
This commit is contained in:
Andreas Volz 2008-07-29 13:01:43 +02:00
parent 4ab448c26e
commit 47d9968dcc
44 changed files with 44 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README
View file

@ -1,4 +1,8 @@
Debugging 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.

4
examples/glib/dbus-browser.cpp
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "dbus-browser.h" #include "dbus-browser.h"
#include <xml.h> #include <xml.h>

4
examples/hal/hal-listen.cpp
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "hal-listen.h" #include "hal-listen.h"
#include <signal.h> #include <signal.h>

4
examples/properties/props-server.cpp
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "props-server.h" #include "props-server.h"
#include <signal.h> #include <signal.h>

4
include/dbus-c++/connection.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_CONNECTION_H #ifndef __DBUSXX_CONNECTION_H
#define __DBUSXX_CONNECTION_H #define __DBUSXX_CONNECTION_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <list> #include <list>

4
include/dbus-c++/debug.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_DEBUG_H #ifndef __DBUSXX_DEBUG_H
#define __DBUSXX_DEBUG_H #define __DBUSXX_DEBUG_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"

5
include/dbus-c++/dispatcher.h
View file

@ -25,10 +25,7 @@
#ifndef __DBUSXX_DISPATCHER_H #ifndef __DBUSXX_DISPATCHER_H
#define __DBUSXX_DISPATCHER_H #define __DBUSXX_DISPATCHER_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"
#include "connection.h" #include "connection.h"
#include "eventloop.h" #include "eventloop.h"

5
include/dbus-c++/ecore-integration.h
View file

@ -25,10 +25,7 @@
#ifndef __DBUSXX_ECORE_INTEGRATION_H #ifndef __DBUSXX_ECORE_INTEGRATION_H
#define __DBUSXX_ECORE_INTEGRATION_H #define __DBUSXX_ECORE_INTEGRATION_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <Ecore.h> #include <Ecore.h>
#include "api.h" #include "api.h"

5
include/dbus-c++/error.h
View file

@ -25,10 +25,7 @@
#ifndef __DBUSXX_ERROR_H #ifndef __DBUSXX_ERROR_H
#define __DBUSXX_ERROR_H #define __DBUSXX_ERROR_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"
#include "util.h" #include "util.h"

5
include/dbus-c++/eventloop-integration.h
View file

@ -25,10 +25,7 @@
#ifndef __DBUSXX_EVENTLOOP_INTEGRATION_H #ifndef __DBUSXX_EVENTLOOP_INTEGRATION_H
#define __DBUSXX_EVENTLOOP_INTEGRATION_H #define __DBUSXX_EVENTLOOP_INTEGRATION_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"
#include "dispatcher.h" #include "dispatcher.h"
#include "util.h" #include "util.h"

4
include/dbus-c++/eventloop.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_EVENTLOOP_H #ifndef __DBUSXX_EVENTLOOP_H
#define __DBUSXX_EVENTLOOP_H #define __DBUSXX_EVENTLOOP_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
#include <pthread.h> #include <pthread.h>

5
include/dbus-c++/glib-integration.h
View file

@ -25,10 +25,7 @@
#ifndef __DBUSXX_GLIB_INTEGRATION_H #ifndef __DBUSXX_GLIB_INTEGRATION_H
#define __DBUSXX_GLIB_INTEGRATION_H #define __DBUSXX_GLIB_INTEGRATION_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <glib.h> #include <glib.h>
#include "api.h" #include "api.h"

4
include/dbus-c++/interface.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_INTERFACE_H #ifndef __DBUSXX_INTERFACE_H
#define __DBUSXX_INTERFACE_H #define __DBUSXX_INTERFACE_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <string> #include <string>
#include <map> #include <map>

4
include/dbus-c++/introspection.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_INTROSPECTION_H #ifndef __DBUSXX_INTROSPECTION_H
#define __DBUSXX_INTROSPECTION_H #define __DBUSXX_INTROSPECTION_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"
#include "interface.h" #include "interface.h"

4
include/dbus-c++/message.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_MESSAGE_H #ifndef __DBUSXX_MESSAGE_H
#define __DBUSXX_MESSAGE_H #define __DBUSXX_MESSAGE_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <string> #include <string>
#include <map> #include <map>

4
include/dbus-c++/object.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_OBJECT_H #ifndef __DBUSXX_OBJECT_H
#define __DBUSXX_OBJECT_H #define __DBUSXX_OBJECT_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <string> #include <string>
#include <list> #include <list>

4
include/dbus-c++/pendingcall.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_PENDING_CALL_H #ifndef __DBUSXX_PENDING_CALL_H
#define __DBUSXX_PENDING_CALL_H #define __DBUSXX_PENDING_CALL_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"
#include "util.h" #include "util.h"

4
include/dbus-c++/property.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_PROPERTY_H #ifndef __DBUSXX_PROPERTY_H
#define __DBUSXX_PROPERTY_H #define __DBUSXX_PROPERTY_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"
#include "types.h" #include "types.h"

4
include/dbus-c++/refptr_impl.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_REFPTR_IMPL_H #ifndef __DBUSXX_REFPTR_IMPL_H
#define __DBUSXX_REFPTR_IMPL_H #define __DBUSXX_REFPTR_IMPL_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"
#include "util.h" #include "util.h"

4
include/dbus-c++/server.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_SERVER_H #ifndef __DBUSXX_SERVER_H
#define __DBUSXX_SERVER_H #define __DBUSXX_SERVER_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <list> #include <list>

4
include/dbus-c++/types.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_TYPES_H #ifndef __DBUSXX_TYPES_H
#define __DBUSXX_TYPES_H #define __DBUSXX_TYPES_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <string> #include <string>
#include <vector> #include <vector>

4
include/dbus-c++/util.h
View file

@ -25,9 +25,7 @@
#ifndef __DBUSXX_UTIL_H #ifndef __DBUSXX_UTIL_H
#define __DBUSXX_UTIL_H #define __DBUSXX_UTIL_H
#ifdef HAVE_DBUSPP_CONFIG_H #include "dbus-c++-config.h"
#include <dbus-c++/dbus-c++-config.h>
#endif
#include "api.h" #include "api.h"
#include "debug.h" #include "debug.h"

4
src/connection.cpp
View file

@ -24,9 +24,9 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>
#include <dbus-c++/connection.h> #include <dbus-c++/connection.h>

2
src/connection_p.h
View file

@ -28,9 +28,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/connection.h> #include <dbus-c++/connection.h>
#include <dbus-c++/server.h> #include <dbus-c++/server.h>

2
src/debug.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>

2
src/dispatcher.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/dispatcher.h> #include <dbus-c++/dispatcher.h>

2
src/dispatcher_p.h
View file

@ -28,9 +28,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/dispatcher.h> #include <dbus-c++/dispatcher.h>

17
src/ecore-integration.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/ecore-integration.h> #include <dbus-c++/ecore-integration.h>
@ -80,9 +78,8 @@ void Ecore::BusTimeout::_enable()
void Ecore::BusTimeout::_disable() void Ecore::BusTimeout::_disable()
{ {
// TODO: port
debug_log("Ecore::BusTimeout::_disable()"); debug_log("Ecore::BusTimeout::_disable()");
// need to enhance Dispatcher with close
ecore_timer_del (_etimer); ecore_timer_del (_etimer);
//g_source_destroy(_source); //g_source_destroy(_source);
} }
@ -96,7 +93,7 @@ struct BusSource
static bool watch_prepare( /*GSource *source,*/ int *timeout ) static bool watch_prepare( /*GSource *source,*/ int *timeout )
{ {
// debug_log("ecore: watch_prepare"); debug_log("ecore: watch_prepare");
*timeout = -1; *timeout = -1;
return false; return false;
@ -104,10 +101,10 @@ static bool watch_prepare( /*GSource *source,*/ int *timeout )
static bool watch_check( /*GSource *source*/ ) static bool watch_check( /*GSource *source*/ )
{ {
// debug_log("ecore: watch_check"); debug_log("ecore: watch_check");
//BusSource* io = (BusSource*)source; //BusSource* io = (BusSource*)source;
return 0;//io->poll.revents ? true : false; return true;//io->poll.revents ? true : false;
} }
// TODO: port parameters // TODO: port parameters
@ -115,9 +112,9 @@ static bool watch_dispatch(/* GSource *source, GSourceFunc callback, */void *dat
{ {
debug_log("ecore: watch_dispatch"); debug_log("ecore: watch_dispatch");
/*bool cb = callback(data); bool cb = true;//callback(data);
DBus::default_dispatcher->dispatch_pending(); //TODO: won't work in case of multiple dispatchers*/ DBus::default_dispatcher->dispatch_pending(); //TODO: won't work in case of multiple dispatchers
return 1;//cb; return cb;
} }
// TODO: needed? // TODO: needed?

2
src/error.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/message.h> #include <dbus-c++/message.h>
#include <dbus-c++/error.h> #include <dbus-c++/error.h>

2
src/eventloop-integration.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/eventloop-integration.h> #include <dbus-c++/eventloop-integration.h>
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>

2
src/eventloop.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/eventloop.h> #include <dbus-c++/eventloop.h>
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>

3
src/glib-integration.cpp
View file

@ -24,10 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/glib-integration.h> #include <dbus-c++/glib-integration.h>
#include <dbus/dbus.h> // for DBUS_WATCH_* #include <dbus/dbus.h> // for DBUS_WATCH_*

2
src/interface.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>
#include <dbus-c++/interface.h> #include <dbus-c++/interface.h>

2
src/internalerror.h
View file

@ -28,9 +28,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/error.h> #include <dbus-c++/error.h>

2
src/introspection.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/introspection.h> #include <dbus-c++/introspection.h>
#include <dbus-c++/object.h> #include <dbus-c++/object.h>

2
src/message.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/message.h> #include <dbus-c++/message.h>

2
src/message_p.h
View file

@ -28,9 +28,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/message.h> #include <dbus-c++/message.h>
#include <dbus-c++/refptr_impl.h> #include <dbus-c++/refptr_impl.h>

2
src/object.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>
#include <dbus-c++/object.h> #include <dbus-c++/object.h>

2
src/pendingcall.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/pendingcall.h> #include <dbus-c++/pendingcall.h>

2
src/pendingcall_p.h
View file

@ -28,9 +28,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/pendingcall.h> #include <dbus-c++/pendingcall.h>
#include <dbus-c++/refptr_impl.h> #include <dbus-c++/refptr_impl.h>

2
src/property.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>
#include <dbus-c++/property.h> #include <dbus-c++/property.h>

2
src/server.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h> #include <dbus-c++/debug.h>
#include <dbus-c++/server.h> #include <dbus-c++/server.h>

2
src/server_p.h
View file

@ -28,9 +28,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/server.h> #include <dbus-c++/server.h>
#include <dbus-c++/dispatcher.h> #include <dbus-c++/dispatcher.h>

2
src/types.cpp
View file

@ -24,9 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h> #include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/types.h> #include <dbus-c++/types.h>
#include <dbus-c++/object.h> #include <dbus-c++/object.h>