diff options
| author | Andreas Volz <andreas@optolix.mittelerde> | 2008-08-30 13:57:15 +0200 |
|---|---|---|
| committer | Andreas Volz <andreas@optolix.mittelerde> | 2008-08-30 13:57:15 +0200 |
| commit | 7db1248454f2f8904f2fc75d398ad37f29956a8a (patch) | |
| tree | 7013da76adeefa90aff9400a539be69eee734fbb /examples | |
| parent | 14ff30abdf02a904247cc097a3c36f4ad916a4f6 (diff) | |
| download | dbus-c++-7db1248454f2f8904f2fc75d398ad37f29956a8a.tar.gz | |
forgot stuff at last commit
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/echo/echo-client.cpp | 4 | ||||
| -rw-r--r-- | examples/ecore/dbus_ecore.cpp | 3 | ||||
| -rw-r--r-- | examples/ecore/dbus_ecore.h | 2 | ||||
| -rw-r--r-- | examples/glib/dbus-browser.cpp | 7 | ||||
| -rw-r--r-- | examples/glib/dbus-browser.h | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/examples/echo/echo-client.cpp b/examples/echo/echo-client.cpp index 0a42b36..093595f 100644 --- a/examples/echo/echo-client.cpp +++ b/examples/echo/echo-client.cpp @@ -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; diff --git a/examples/ecore/dbus_ecore.cpp b/examples/ecore/dbus_ecore.cpp index 569285d..f0686dc 100644 --- a/examples/ecore/dbus_ecore.cpp +++ b/examples/ecore/dbus_ecore.cpp @@ -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) { diff --git a/examples/ecore/dbus_ecore.h b/examples/ecore/dbus_ecore.h index 295068c..d00d6ea 100644 --- a/examples/ecore/dbus_ecore.h +++ b/examples/ecore/dbus_ecore.h @@ -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 { diff --git a/examples/glib/dbus-browser.cpp b/examples/glib/dbus-browser.cpp index 5e27fc4..77a3a22 100644 --- a/examples/glib/dbus-browser.cpp +++ b/examples/glib/dbus-browser.cpp @@ -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"; diff --git a/examples/glib/dbus-browser.h b/examples/glib/dbus-browser.h index 4e95980..9bbefbf 100644 --- a/examples/glib/dbus-browser.h +++ b/examples/glib/dbus-browser.h @@ -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 |