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

forgot stuff at last commit

Browse source
This commit is contained in:
Andreas Volz 2008-08-30 13:57:15 +02:00
parent 14ff30abdf
commit 7db1248454
48 changed files with 18 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -5,7 +5,6 @@ AC_INIT([libdbus-c++], 0.5.0, [shackan@gmail.com])
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER([config.h])
AX_CONFIG_PRIVATE_HEADER(include/dbus-c++/dbus-c++-config.h, dbus-c++,HAVE_DBUSPP_CONFIG_H)
AC_CANONICAL_HOST
@ -83,17 +82,17 @@ AC_SUBST(dbus_LIBS)
DBUS_API_STABLE_VERSION=1.0.0
PKG_CHECK_EXISTS([dbus-1 < $DBUS_API_STABLE_VERSION],
[AX_DEFINE_PRIVATE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])]
[AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])]
)
DBUS_THREADS_INIT_DEFAULT_VERSION=0.93
PKG_CHECK_EXISTS([dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION],
[AX_DEFINE_PRIVATE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])]
[AC_DEFINE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])]
)
DBUS_RECURSIVE_MUTEX_VERSION=0.95
PKG_CHECK_EXISTS([dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION],
[AX_DEFINE_PRIVATE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])]
[AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])]
)

4
examples/echo/echo-client.cpp
View file

@ -64,11 +64,7 @@ int main()
signal(SIGTERM, niam);
signal(SIGINT, niam);
#ifdef DBUS_HAS_THREADS_INIT_DEFAULT
DBus::_init_threading();
#else
cerr << "Thread support is not enabled! your D-Bus version is too old" << endl;
#endif
DBus::default_dispatcher = &dispatcher;

3
examples/ecore/dbus_ecore.cpp
View file

@ -6,12 +6,15 @@
#include <xml.h>
#include <iostream>
#include <vector>
using namespace std;
static const char* DBUS_SERVER_NAME = "org.freedesktop.DBus";
static const char* DBUS_SERVER_PATH = "/org/freedesktop/DBus";
typedef vector <string> Names;
DBusBrowser::DBusBrowser( ::DBus::Connection& conn )
: ::DBus::ObjectProxy(conn, DBUS_SERVER_PATH, DBUS_SERVER_NAME)
{

2
examples/ecore/dbus_ecore.h
View file

@ -8,7 +8,7 @@
#include "dbus_ecore-glue.h"
class DBusBrowser
: public org::freedesktop::DBus,
: public org::freedesktop::DBus_proxy,
public DBus::IntrospectableProxy,
public DBus::ObjectProxy
{

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

@ -1,14 +1,13 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "dbus-browser.h"
#include <xml.h>
#include <iostream>
#include <vector>
using namespace std;
typedef vector <string> Names;
static const char *DBUS_SERVER_NAME = "org.freedesktop.DBus";
static const char *DBUS_SERVER_PATH = "/org/freedesktop/DBus";

2
examples/glib/dbus-browser.h
View file

@ -19,7 +19,7 @@ public:
};
class DBusBrowser
: public org::freedesktop::DBus,
: public org::freedesktop::DBus_proxy,
public DBus::IntrospectableProxy,
public DBus::ObjectProxy,
public Gtk::Window

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_CONNECTION_H
#define __DBUSXX_CONNECTION_H
#include "dbus-c++-config.h"
#include <list>
#include "api.h"

1
include/dbus-c++/dbus.h
View file

@ -25,7 +25,6 @@
#ifndef __DBUSXX_DBUS_H
#define __DBUSXX_DBUS_H
#include "dbus-c++-config.h"
#include "types.h"
#include "interface.h"
#include "object.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_DEBUG_H
#define __DBUSXX_DEBUG_H
#include "dbus-c++-config.h"
#include "api.h"
namespace DBus {

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

@ -25,7 +25,6 @@
#ifndef __DBUSXX_DISPATCHER_H
#define __DBUSXX_DISPATCHER_H
#include "dbus-c++-config.h"
#include "api.h"
#include "connection.h"
#include "eventloop.h"
@ -222,16 +221,15 @@ protected:
Internal *_int;
};
#ifndef DBUS_HAS_RECURSIVE_MUTEX
typedef Mutex *(*MutexNewFn)();
typedef void (*MutexUnlockFn)(Mutex *mx);
#ifndef DBUS_HAS_RECURSIVE_MUTEX
typedef bool (*MutexFreeFn)(Mutex *mx);
typedef bool (*MutexLockFn)(Mutex *mx);
typedef void (*MutexUnlockFn)(Mutex *mx);
#else
typedef Mutex *(*MutexNewFn)();
typedef void (*MutexFreeFn)(Mutex *mx);
typedef void (*MutexLockFn)(Mutex *mx);
typedef void (*MutexUnlockFn)(Mutex *mx);
#endif//DBUS_HAS_RECURSIVE_MUTEX
typedef CondVar *(*CondVarNewFn)();
@ -241,9 +239,7 @@ typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout);
typedef void (*CondVarWakeOneFn)(CondVar *cv);
typedef void (*CondVarWakeAllFn)(CondVar *cv);
#ifdef DBUS_HAS_THREADS_INIT_DEFAULT
void DXXAPI _init_threading();
#endif//DBUS_HAS_THREADS_INIT_DEFAULT
void DXXAPI _init_threading(
MutexNewFn, MutexFreeFn, MutexLockFn, MutexUnlockFn,

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

@ -25,7 +25,6 @@
#ifndef __DBUSXX_ECORE_INTEGRATION_H
#define __DBUSXX_ECORE_INTEGRATION_H
#include "dbus-c++-config.h"
#include <Ecore.h>
#include "api.h"

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

@ -25,7 +25,6 @@
#ifndef __DBUSXX_ERROR_H
#define __DBUSXX_ERROR_H
#include "dbus-c++-config.h"
#include "api.h"
#include "util.h"

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

@ -25,7 +25,6 @@
#ifndef __DBUSXX_EVENTLOOP_INTEGRATION_H
#define __DBUSXX_EVENTLOOP_INTEGRATION_H
#include "dbus-c++-config.h"
#include "api.h"
#include "dispatcher.h"
#include "util.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_EVENTLOOP_H
#define __DBUSXX_EVENTLOOP_H
#include "dbus-c++-config.h"
#include <pthread.h>
#include <list>

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

@ -25,7 +25,6 @@
#ifndef __DBUSXX_GLIB_INTEGRATION_H
#define __DBUSXX_GLIB_INTEGRATION_H
#include "dbus-c++-config.h"
#include <glib.h>
#include "api.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_INTERFACE_H
#define __DBUSXX_INTERFACE_H
#include "dbus-c++-config.h"
#include <string>
#include <map>
#include "api.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_INTROSPECTION_H
#define __DBUSXX_INTROSPECTION_H
#include "dbus-c++-config.h"
#include "api.h"
#include "interface.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_MESSAGE_H
#define __DBUSXX_MESSAGE_H
#include "dbus-c++-config.h"
#include <string>
#include <map>

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_OBJECT_H
#define __DBUSXX_OBJECT_H
#include "dbus-c++-config.h"
#include <string>
#include <list>

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_PENDING_CALL_H
#define __DBUSXX_PENDING_CALL_H
#include "dbus-c++-config.h"
#include "api.h"
#include "util.h"
#include "message.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_PROPERTY_H
#define __DBUSXX_PROPERTY_H
#include "dbus-c++-config.h"
#include "api.h"
#include "types.h"
#include "interface.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_REFPTR_IMPL_H
#define __DBUSXX_REFPTR_IMPL_H
#include "dbus-c++-config.h"
#include "api.h"
#include "util.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_SERVER_H
#define __DBUSXX_SERVER_H
#include "dbus-c++-config.h"
#include <list>
#include "api.h"

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_TYPES_H
#define __DBUSXX_TYPES_H
#include "dbus-c++-config.h"
#include <stdint.h>
#include <string>
#include <vector>

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

@ -25,8 +25,6 @@
#ifndef __DBUSXX_UTIL_H
#define __DBUSXX_UTIL_H
#include "dbus-c++-config.h"
#include "api.h"
#include "debug.h"

3
src/Makefile.am
View file

@ -16,11 +16,8 @@ ECORE_H = $(HEADER_DIR)/ecore-integration.h
ECORE_CPP = ecore-integration.cpp
endif
CONFIG_H = $(top_builddir)/include/dbus-c++/dbus-c++-config.h
HEADER_DIR = $(top_srcdir)/include/dbus-c++
HEADER_FILES = \
$(CONFIG_H) \
$(HEADER_DIR)/dbus.h \
$(HEADER_DIR)/types.h \
$(HEADER_DIR)/connection.h \

3
src/connection.cpp
View file

@ -25,9 +25,6 @@
#include <config.h>
#endif
#include <dbus-c++/dbus-c++-config.h>
#include <dbus-c++/debug.h>
#include <dbus-c++/connection.h>

1
src/connection_p.h
View file

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

1
src/debug.cpp
View file

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

7
src/dispatcher.cpp
View file

@ -24,7 +24,6 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <dbus-c++/dbus-c++-config.h>
#include <dbus-c++/dispatcher.h>
@ -181,12 +180,14 @@ void Dispatcher::dispatch_pending()
_mutex_p.unlock();
}
#ifdef DBUS_HAS_THREADS_INIT_DEFAULT
void DBus::_init_threading()
{
#ifdef DBUS_HAS_THREADS_INIT_DEFAULT
dbus_threads_init_default();
}
#else
debug_log("Thread support is not enabled! Your D-Bus version is too old!");
#endif//DBUS_HAS_THREADS_INIT_DEFAULT
}
void DBus::_init_threading(
MutexNewFn m1,

1
src/dispatcher_p.h
View file

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

1
src/ecore-integration.cpp
View file

@ -24,7 +24,6 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <dbus-c++/dbus-c++-config.h>
#include <dbus-c++/ecore-integration.h>

1
src/error.cpp
View file

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

1
src/eventloop-integration.cpp
View file

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

1
src/eventloop.cpp
View file

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

1
src/glib-integration.cpp
View file

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

1
src/interface.cpp
View file

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

1
src/internalerror.h
View file

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

1
src/introspection.cpp
View file

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

1
src/message.cpp
View file

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

1
src/message_p.h
View file

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

1
src/object.cpp
View file

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

1
src/pendingcall.cpp
View file

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

1
src/pendingcall_p.h
View file

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

1
src/property.cpp
View file

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

1
src/server.cpp
View file

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

1
src/server_p.h
View file

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

1
src/types.cpp
View file

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