diff --git a/sflphone-common/libs/dbus-c++/INSTALL b/sflphone-common/libs/dbus-c++/INSTALL deleted file mode 100644 index d3c5b40a94091285c27361905f591af64c1f7b21..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/INSTALL +++ /dev/null @@ -1,237 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 6. Often, you can also type `make uninstall' to remove the installed - files again. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/sflphone-common/libs/dbus-c++/NEWS b/sflphone-common/libs/dbus-c++/NEWS deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/sflphone-common/libs/dbus-c++/SConscript b/sflphone-common/libs/dbus-c++/SConscript deleted file mode 100644 index d7b235898951800d2de2cb1470266aa63daad1df..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/SConscript +++ /dev/null @@ -1,85 +0,0 @@ -# -# library -# - -env = WengoGetEnvironment() - -env.ParseConfig('pkg-config --cflags --libs dbus-1') - -libs = [ - 'expat' -] -lib_path = [] -include_path = [ - 'include' -] -defines = { - 'DBUS_API_SUBJECT_TO_CHANGE':1, - 'DEBUG':1 -} -headers = [] -sources = [ - 'src/connection.cpp', - 'src/debug.cpp', - 'src/dispatcher.cpp', - 'src/error.cpp', - 'src/eventloop.cpp', - 'src/interface.cpp', - 'src/introspection.cpp', - 'src/property.cpp', - 'src/message.cpp', - 'src/object.cpp', - 'src/pendingcall.cpp', - 'src/server.cpp', - 'src/types.cpp', - 'src/xml.cpp' -] - -env.WengoAddDefines(defines) -env.WengoAddIncludePath(include_path) -env.WengoUseLibraries(libs) -env.WengoStaticLibrary('dbus-c++', sources) - -# -# tools -# - -tools_env = WengoGetEnvironment() - -tools_libs = [ - 'dbus-c++' -] -tools_defines = { - 'DBUS_API_SUBJECT_TO_CHANGE':1, -} -introspect_sources = [ - 'tools/introspect.cpp', -] - -xml2cpp_sources = [ - 'tools/xml2cpp.cpp' -] - -#tools_env.Append(LINKFLAGS = '-z origin') -#tools_env.Append(RPATH = env.Literal('\\$$ORIGIN\.')) - -tools_env.WengoAddDefines(tools_defines) -tools_env.WengoAddIncludePath(include_path) -tools_env.WengoUseLibraries(tools_libs) - -dbusxx_introspect = tools_env.WengoProgram('dbusxx-introspect', introspect_sources) -dbusxx_xml2cpp = tools_env.WengoProgram('dbusxx-xml2cpp', xml2cpp_sources) - -# -# xml translator -# - -def dbusxx_xml2cpp_emitter(target, source, env): - env.Depends(target, dbusxx_xml2cpp) - return (target, source) - -dbusxx_xml2cpp_builder = Builder(action = dbusxx_xml2cpp[0].abspath + ' $SOURCE --adaptor=$TARGET', - emitter = dbusxx_xml2cpp_emitter, - suffix = '.h', src_suffix = '.xml') - -Export('dbusxx_xml2cpp_builder') diff --git a/sflphone-common/libs/dbus-c++/TODO b/sflphone-common/libs/dbus-c++/TODO deleted file mode 100644 index f975a80a45241239e7a50bbb859bdc26de54d1c2..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/TODO +++ /dev/null @@ -1,8 +0,0 @@ -* Implement asynchronous method calls (hint: start from DBus::PendingCall) -* ...and patch the codegen to generate stubs for them -* Implement continuations in a saner way -* Find time for some hardcore valgrinding -* Make DBus::Server free an incoming connection when it's disconnected, not when freeing the server -* More examples -* Inline (Doxygen-style) documentation -* Native protocol implementation (as an alternative to libdbus) diff --git a/sflphone-common/libs/dbus-c++/dbus-c++-1-uninstalled.pc.in b/sflphone-common/libs/dbus-c++/dbus-c++-1-uninstalled.pc.in deleted file mode 100644 index 839fa86ab6375c46cf961ad5dca2c9789eecca2e..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/dbus-c++-1-uninstalled.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix= -exec_prefix= -libdir=src -includedir=include - -Name: @PACKAGE@ -Description: Native C++ bindings for D-Bus, Not Installed -Version: @VERSION@ -Requires: -Conflicts: -Libs: ${pcfiledir}/${libdir}/libdbus-c++-1.la -Cflags: -I${pcfiledir}/${includedir} - diff --git a/sflphone-common/libs/dbus-c++/dbus-c++-1.pc.in b/sflphone-common/libs/dbus-c++/dbus-c++-1.pc.in deleted file mode 100644 index bc5860a95594e9bd30af8687b7c1e162f6fd79bb..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/dbus-c++-1.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: dbus-c++ -Description: Native C++ bindings for D-Bus. -Requires: dbus-1 -Version: @VERSION@ -Libs: -L${libdir} -ldbus-c++-1 -Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE diff --git a/sflphone-common/libs/dbus-c++/dbus-c++.anjuta b/sflphone-common/libs/dbus-c++/dbus-c++.anjuta deleted file mode 100644 index 51ddd65d3854589b10f6dbbc31962c93684ac7cc..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/dbus-c++.anjuta +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0"?> -<anjuta> - <plugin name="GBF Project Manager" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaProjectManager"/> - <require group="Project" - attribute="Supported-Project-Types" - value="automake"/> - </plugin> - <plugin name="Symbol Browser" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaSymbolManager"/> - </plugin> - <plugin name="Make Build System" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaBuildable"/> - <require group="Build" - attribute="Supported-Build-Types" - value="make"/> - </plugin> - <plugin name="Task Manager" - url="http://anjuta.org/plugins/" - mandatory="no"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaTodo"/> - </plugin> - <plugin name="Debug Manager" - url="http://anjuta.org/plugins/" - mandatory="no"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaDebuggerManager"/> - </plugin> -</anjuta> diff --git a/sflphone-common/libs/dbus-c++/doc/Doxyfile.in b/sflphone-common/libs/dbus-c++/doc/Doxyfile.in deleted file mode 100644 index a2b3d4415fe2026b0f0e520d88934377bda6ff9a..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/doc/Doxyfile.in +++ /dev/null @@ -1,251 +0,0 @@ -# Doxyfile 1.4.6 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = @PACKAGE@ -PROJECT_NUMBER = @VERSION@ -OUTPUT_DIRECTORY = @top_srcdir@/doc/ -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 4 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -BUILTIN_STL_SUPPORT = YES -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = NO -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = YES -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = YES -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = @top_srcdir@/src/ @top_srcdir@/include/ -FILE_PATTERNS = *.cpp \ - *.h -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = Makefile.* \ - ChangeLog \ - CHANGES \ - CHANGES.* \ - README \ - README.* \ - *.png \ - AUTHORS \ - DESIGN \ - DESIGN.* \ - *.desktop \ - DESKTOP* \ - COMMENTS \ - HOWTO \ - magic \ - NOTES \ - TODO \ - THANKS -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NO -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = NO -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 640 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 1000 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/sflphone-common/libs/dbus-c++/doc/Makefile.am b/sflphone-common/libs/dbus-c++/doc/Makefile.am deleted file mode 100644 index 39fd9b9deb140ecfadc9dde627dc835de95fb335..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/doc/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -if DBUS_DOXYGEN_DOCS_ENABLED - -EXTRA_DIST = Doxyfile.in - -noinst_PROGRAMS = index.html - -index_html_SOURCES = Doxyfile - -index.html: Doxyfile - doxygen Doxyfile - -endif - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/sflphone-common/libs/dbus-c++/doc/html/Makefile.am b/sflphone-common/libs/dbus-c++/doc/html/Makefile.am deleted file mode 100644 index 8eb67f86574b1821e66ddf261e6c7de2eaa46546..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/doc/html/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -CLEANFILES = *.html *.css *.png *.gif - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/sflphone-common/libs/dbus-c++/examples/Makefile.am b/sflphone-common/libs/dbus-c++/examples/Makefile.am deleted file mode 100644 index b346604bad07e6aabfc20c1e3a581325446085f1..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = properties echo hal glib - -MAINTAINERCLEANFILES = \ - Makefile.in - diff --git a/sflphone-common/libs/dbus-c++/examples/echo/Makefile.am b/sflphone-common/libs/dbus-c++/examples/echo/Makefile.am deleted file mode 100644 index 63fe2eb1f0f31b0cae3218e5fdbb3471072ae649..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/echo/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -EXTRA_DIST = README echo-introspect.xml - -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = echo-server - -echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp -echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la - -echo-server-glue.h: echo-introspect.xml - $(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@ - -noinst_PROGRAMS += echo-client-mt - -echo_client_mt_SOURCES = echo-client-glue.h echo-client.h echo-client.cpp -echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@ -echo_client_mt_CXXFLAGS = @PTHREAD_CFLAGS@ - -echo-client-glue.h: echo-introspect.xml - $(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@ - -BUILT_SOURCES = echo-server-glue.h echo-client-glue.h -CLEANFILES = $(BUILT_SOURCES) - -dist-hook: - cd $(distdir); rm -f $(BUILT_SOURCES) - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/sflphone-common/libs/dbus-c++/examples/echo/README b/sflphone-common/libs/dbus-c++/examples/echo/README deleted file mode 100644 index 74e1d6d16c59858237e98e5186000951397d95d5..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/echo/README +++ /dev/null @@ -1,23 +0,0 @@ -This is probably the most simple D-Bus program you could conceive - -To test, run `DBUSXX_VERBOSE=1 ./echo-server` and try the following commands: - -dbus-send --dest=org.freedesktop.DBus.Examples.Echo --type=method_call --print-reply /org/freedesktop/DBus/Examples/Echo org.freedesktop.DBus.EchoDemo.Random - -dbus-send --dest=org.freedesktop.DBus.Examples.Echo --type=method_call --print-reply /org/freedesktop/DBus/Examples/Echo org.freedesktop.DBus.EchoDemo.Hello string:"world" - -dbus-send --dest=org.freedesktop.DBus.Examples.Echo --type=method_call --print-reply /org/freedesktop/DBus/Examples/Echo org.freedesktop.DBus.EchoDemo.Sum array:int32:10,100,250 - -dbus-send --dest=org.freedesktop.DBus.Examples.Echo --type=method_call --print-reply /org/freedesktop/DBus/Examples/Echo org.freedesktop.DBus.EchoDemo.Info - -or, using python instead - -$ python -import dbus -bus = dbus.SessionBus() -object = bus.get_object('org.freedesktop.DBus.Examples.Echo','/org/freedesktop/DBus/Examples/Echo') -echo = dbus.Interface(object, dbus_interface='org.freedesktop.DBus.EchoDemo') -echo.Random() -echo.Hello("world") -echo.Sum([123, 234, 95, 520]) -echo.Info() diff --git a/sflphone-common/libs/dbus-c++/examples/echo/echo-client.cpp b/sflphone-common/libs/dbus-c++/examples/echo/echo-client.cpp deleted file mode 100644 index 093595f20aea476d5e7b03a5ca414be091ea296d..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/echo/echo-client.cpp +++ /dev/null @@ -1,90 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "echo-client.h" -#include <iostream> -#include <pthread.h> -#include <signal.h> - -using namespace std; - -static const char *ECHO_SERVER_NAME = "org.freedesktop.DBus.Examples.Echo"; -static const char *ECHO_SERVER_PATH = "/org/freedesktop/DBus/Examples/Echo"; - -EchoClient::EchoClient(DBus::Connection &connection, const char *path, const char *name) -: DBus::ObjectProxy(connection, path, name) -{ -} - -void EchoClient::Echoed(const DBus::Variant &value) -{ - cout << "!"; -} - -/* - * For some strange reason, libdbus frequently dies with an OOM - */ - -static const int THREADS = 3; - -static bool spin = true; - -void *greeter_thread(void *arg) -{ - DBus::Connection *conn = reinterpret_cast<DBus::Connection *>(arg); - - EchoClient client(*conn, ECHO_SERVER_PATH, ECHO_SERVER_NAME); - - char idstr[16]; - - snprintf(idstr, sizeof(idstr), "%lu", pthread_self()); - - for (int i = 0; i < 30 && spin; ++i) - { - cout << client.Hello(idstr) << endl; - } - - cout << idstr << " done " << endl; - - return NULL; -} - -DBus::BusDispatcher dispatcher; - -void niam(int sig) -{ - spin = false; - - dispatcher.leave(); -} - -int main() -{ - signal(SIGTERM, niam); - signal(SIGINT, niam); - - DBus::_init_threading(); - - DBus::default_dispatcher = &dispatcher; - - DBus::Connection conn = DBus::Connection::SessionBus(); - - pthread_t threads[THREADS]; - - for (int i = 0; i < THREADS; ++i) - { - pthread_create(threads+i, NULL, greeter_thread, &conn); - } - - dispatcher.enter(); - - cout << "terminating" << endl; - - for (int i = 0; i < THREADS; ++i) - { - pthread_join(threads[i], NULL); - } - - return 0; -} diff --git a/sflphone-common/libs/dbus-c++/examples/echo/echo-client.h b/sflphone-common/libs/dbus-c++/examples/echo/echo-client.h deleted file mode 100644 index 54401eca4152e03a5621e6b947a3062eb911d702..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/echo/echo-client.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __DEMO_ECHO_CLIENT_H -#define __DEMO_ECHO_CLIENT_H - -#include <dbus-c++/dbus.h> -#include "echo-client-glue.h" - -class EchoClient -: public org::freedesktop::DBus::EchoDemo_proxy, - public DBus::IntrospectableProxy, - public DBus::ObjectProxy -{ -public: - - EchoClient(DBus::Connection &connection, const char *path, const char *name); - - void Echoed(const DBus::Variant &value); -}; - -#endif//__DEMO_ECHO_CLIENT_H diff --git a/sflphone-common/libs/dbus-c++/examples/echo/echo-introspect.xml b/sflphone-common/libs/dbus-c++/examples/echo/echo-introspect.xml deleted file mode 100644 index 7d415abdd4c17c9bd653bb9d619fc9dff22f5264..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/echo/echo-introspect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" ?> -<node name="/org/freedesktop/DBus/Examples/Echo"> - <interface name="org.freedesktop.DBus.EchoDemo"> - <method name="Random"> - <arg type="i" name="version" direction="out"/> - </method> - <method name="Hello"> - <arg type="s" name="name" direction="in"/> - <arg type="s" name="greeting" direction="out"/> - </method> - <method name="Echo"> - <arg type="v" name="input" direction="in"/> - <arg type="v" name="output" direction="out"/> - </method> - <method name="Cat"> - <arg type="s" name="file" direction="in"/> - <arg type="ay" name="stream" direction="out"/> - </method> - <method name="Sum"> - <arg type="ai" name="ints" direction="in"/> - <arg type="i" names="sum" direction="out"/> - </method> - <signal name="Echoed"> - <arg type="v" name="value"/> - </signal> - <method name="Info"> - <arg type="a{ss}" name="info" direction="out"/> - </method> - </interface> -</node> diff --git a/sflphone-common/libs/dbus-c++/examples/echo/echo-server.cpp b/sflphone-common/libs/dbus-c++/examples/echo/echo-server.cpp deleted file mode 100644 index cbcd5178d8e576864ca654fc0c22dc3c25cd71b3..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/echo/echo-server.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "echo-server.h" -#include <unistd.h> -#include <stdlib.h> -#include <signal.h> -#include <stdio.h> -#include <limits.h> - -static const char *ECHO_SERVER_NAME = "org.freedesktop.DBus.Examples.Echo"; -static const char *ECHO_SERVER_PATH = "/org/freedesktop/DBus/Examples/Echo"; - -EchoServer::EchoServer(DBus::Connection &connection) -: DBus::ObjectAdaptor(connection, ECHO_SERVER_PATH) -{ -} - -int32_t EchoServer::Random() -{ - return rand(); -} - -std::string EchoServer::Hello(const std::string &name) -{ - return "Hello " + name + "!"; -} - -DBus::Variant EchoServer::Echo(const DBus::Variant &value) -{ - this->Echoed(value); - - return value; -} - -std::vector< uint8_t > EchoServer::Cat(const std::string &file) -{ - FILE *handle = fopen(file.c_str(), "rb"); - - if (!handle) throw DBus::Error("org.freedesktop.DBus.EchoDemo.ErrorFileNotFound", "file not found"); - - uint8_t buff[1024]; - - size_t nread = fread(buff, 1, sizeof(buff), handle); - - fclose(handle); - - return std::vector< uint8_t > (buff, buff + nread); -} - -int32_t EchoServer::Sum(const std::vector<int32_t>& ints) -{ - int32_t sum = 0; - - for (size_t i = 0; i < ints.size(); ++i) sum += ints[i]; - - return sum; -} - -std::map< std::string, std::string > EchoServer::Info() -{ - std::map< std::string, std::string > info; - char hostname[HOST_NAME_MAX]; - - gethostname(hostname, sizeof(hostname)); - info["hostname"] = hostname; - info["username"] = getlogin(); - - return info; -} - - -DBus::BusDispatcher dispatcher; - -void niam(int sig) -{ - dispatcher.leave(); -} - -int main() -{ - signal(SIGTERM, niam); - signal(SIGINT, niam); - - DBus::default_dispatcher = &dispatcher; - - DBus::Connection conn = DBus::Connection::SessionBus(); - conn.request_name(ECHO_SERVER_NAME); - - EchoServer server(conn); - - dispatcher.enter(); - - return 0; -} diff --git a/sflphone-common/libs/dbus-c++/examples/echo/echo-server.h b/sflphone-common/libs/dbus-c++/examples/echo/echo-server.h deleted file mode 100644 index 3f0be5811733e4439ff9a80fa762266b1a9df974..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/echo/echo-server.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __DEMO_ECHO_SERVER_H -#define __DEMO_ECHO_SERVER_H - -#include <dbus-c++/dbus.h> -#include "echo-server-glue.h" - -class EchoServer -: public org::freedesktop::DBus::EchoDemo_adaptor, - public DBus::IntrospectableAdaptor, - public DBus::ObjectAdaptor -{ -public: - - EchoServer(DBus::Connection &connection); - - int32_t Random(); - - std::string Hello(const std::string &name); - - DBus::Variant Echo(const DBus::Variant &value); - - std::vector< uint8_t > Cat(const std::string &file); - - int32_t Sum(const std::vector<int32_t> & ints); - - std::map< std::string, std::string > Info(); -}; - -#endif//__DEMO_ECHO_SERVER_H diff --git a/sflphone-common/libs/dbus-c++/examples/ecore/Makefile.am b/sflphone-common/libs/dbus-c++/examples/ecore/Makefile.am deleted file mode 100644 index 93ab95956744ce1a5a53ff96b15d4d541b36a944..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/ecore/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -EXTRA_DIST = - -AM_CPPFLAGS = -I$(top_srcdir)/include $(ecore_CFLAGS) $(xml_CFLAGS) -I$(top_srcdir)/tools - -if ENABLE_ECORE -noinst_PROGRAMS = dbus_ecore -endif - -dbus_ecore_SOURCES = dbus_ecore-glue.h dbus_ecore.h dbus_ecore.cpp $(top_srcdir)/tools/xml.cpp -dbus_ecore_LDADD = $(top_builddir)/src/libdbus-c++-1.la $(ecore_LIBS) $(xml_LIBS) - -dbus_ecore-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml - $(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@ - -BUILT_SOURCES = dbus_ecore-glue.h -CLEANFILES = $(BUILT_SOURCES) - -dist-hook: - cd $(distdir); rm -f $(BUILT_SOURCES) - -MAINTAINERCLEANFILES = \ - Makefile.in - diff --git a/sflphone-common/libs/dbus-c++/examples/ecore/dbus_ecore.cpp b/sflphone-common/libs/dbus-c++/examples/ecore/dbus_ecore.cpp deleted file mode 100644 index f0686dcff476928a7ffadad40e9b35118a41b43d..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/ecore/dbus_ecore.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "dbus_ecore.h" - -#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) -{ - typedef std::vector< std::string > Names; - - Names names = ListNames(); - - for(Names::iterator it = names.begin(); it != names.end(); ++it) - { - cout << *it << endl; - } -} - -void DBusBrowser::NameOwnerChanged( - const std::string& name, const std::string& old_owner, const std::string& new_owner ) -{ - cout << name << ": " << old_owner << " -> " << new_owner << endl; -} - -void DBusBrowser::NameLost( const std::string& name ) -{ - cout << name << " lost" << endl; -} - -void DBusBrowser::NameAcquired( const std::string& name ) -{ - cout << name << " acquired" << endl; -} - -DBus::Ecore::BusDispatcher dispatcher; - -void niam( int sig ) -{ - ecore_main_loop_quit(); -} - -int main(int argc, char* argv[]) -{ - signal(SIGTERM, niam); - signal(SIGINT, niam); - - ecore_init(); - - DBus::default_dispatcher = &dispatcher; - - DBus::Connection conn = DBus::Connection::SessionBus(); - - DBusBrowser browser(conn); - - ecore_main_loop_begin(); - ecore_shutdown(); - - return 0; -} diff --git a/sflphone-common/libs/dbus-c++/examples/ecore/dbus_ecore.h b/sflphone-common/libs/dbus-c++/examples/ecore/dbus_ecore.h deleted file mode 100644 index d00d6ea0f67ce3013079dd61b087eed4f7685ce5..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/ecore/dbus_ecore.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef __DEMO_DBUS_BROWSER_H -#define __DEMO_DBUS_BROWSER_H - -#include <dbus-c++/dbus.h> -#include <dbus-c++/ecore-integration.h> -#include <Ecore.h> - -#include "dbus_ecore-glue.h" - -class DBusBrowser -: public org::freedesktop::DBus_proxy, - public DBus::IntrospectableProxy, - public DBus::ObjectProxy -{ -public: - - DBusBrowser( ::DBus::Connection& conn ); - -private: - - void NameOwnerChanged( const std::string&, const std::string&, const std::string& ); - - void NameLost( const std::string& ); - - void NameAcquired( const std::string& ); - -private: - -}; - -#endif//__DEMO_DBUS_BROWSER_H diff --git a/sflphone-common/libs/dbus-c++/examples/glib/Makefile.am b/sflphone-common/libs/dbus-c++/examples/glib/Makefile.am deleted file mode 100644 index 42a33d8edb4959e50ea54e7edca045f79e5ca783..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/glib/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -EXTRA_DIST = - -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(gtkmm_CFLAGS) -I$(top_srcdir)/tools - -if HAVE_GTKMM -noinst_PROGRAMS = dbus-browser -endif - -dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp $(top_srcdir)/tools/xml.cpp -dbus_browser_LDADD = $(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS) - -dbus-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml - $(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@ - -BUILT_SOURCES = dbus-glue.h -CLEANFILES = $(BUILT_SOURCES) - -dist-hook: - cd $(distdir); rm -f $(BUILT_SOURCES) - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/sflphone-common/libs/dbus-c++/examples/glib/dbus-browser.cpp b/sflphone-common/libs/dbus-c++/examples/glib/dbus-browser.cpp deleted file mode 100644 index 382d07f17a1dae20f200a445c18ae5e5b687278a..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/glib/dbus-browser.cpp +++ /dev/null @@ -1,136 +0,0 @@ -#include "dbus-browser.h" - -#include <xml.h> -#include <iostream> - -using namespace std; - -static const char *DBUS_SERVER_NAME = "org.freedesktop.DBus"; -static const char *DBUS_SERVER_PATH = "/org/freedesktop/DBus"; - -DBusBrowser::DBusBrowser(::DBus::Connection &conn) -: ::DBus::ObjectProxy(conn, DBUS_SERVER_PATH, DBUS_SERVER_NAME) -{ - set_title("D-Bus Browser"); - set_border_width(5); - set_default_size(400, 500); - - typedef std::vector< std::string > Names; - - Names names = ListNames(); - - for (Names::iterator it = names.begin(); it != names.end(); ++it) - { - _cb_busnames.append_text(*it); - } - - _cb_busnames.signal_changed().connect(sigc::mem_fun(*this, &DBusBrowser::on_select_busname)); - - _tm_inspect = Gtk::TreeStore::create(_records); - _tv_inspect.set_model(_tm_inspect); - _tv_inspect.append_column("Node", _records.name); - - _sc_tree.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); - _sc_tree.add(_tv_inspect); - - _vbox.pack_start(_cb_busnames, Gtk::PACK_SHRINK); - _vbox.pack_start(_sc_tree); - - add(_vbox); - - show_all_children(); -} - -void DBusBrowser::NameOwnerChanged( - const std::string &name, const std::string &old_owner, const std::string &new_owner) -{ - cout << name << ": " << old_owner << " -> " << new_owner << endl; -} - -void DBusBrowser::NameLost(const std::string &name) -{ - cout << name << " lost" << endl; -} - -void DBusBrowser::NameAcquired(const std::string &name) -{ - cout << name << " acquired" << endl; -} - -void DBusBrowser::on_select_busname() -{ - Glib::ustring busname = _cb_busnames.get_active_text(); - if (busname.empty()) return; - - _tm_inspect->clear(); - _inspect_append(NULL, "", busname); -} - -void DBusBrowser::_inspect_append(Gtk::TreeModel::Row *row, const std::string &buspath, const std::string &busname) -{ - DBusInspector inspector(conn(), buspath.empty() ? "/" : buspath.c_str(), busname.c_str()); - - ::DBus::Xml::Document doc(inspector.Introspect()); - ::DBus::Xml::Node &root = *(doc.root); - - ::DBus::Xml::Nodes ifaces = root["interface"]; - - for (::DBus::Xml::Nodes::iterator ii = ifaces.begin(); ii != ifaces.end(); ++ii) - { - ::DBus::Xml::Node &iface = **ii; - - Gtk::TreeModel::Row i_row = row - ? *(_tm_inspect->append(row->children())) - : *(_tm_inspect->append()); - i_row[_records.name] = "interface: " + iface.get("name"); - - ::DBus::Xml::Nodes methods = iface["method"]; - - for (::DBus::Xml::Nodes::iterator im = methods.begin(); im != methods.end(); ++im) - { - Gtk::TreeModel::Row m_row = *(_tm_inspect->append(i_row.children())); - m_row[_records.name] = "method: " + (*im)->get("name"); - } - - ::DBus::Xml::Nodes signals = iface["signal"]; - - for (::DBus::Xml::Nodes::iterator is = signals.begin(); is != signals.end(); ++is) - { - Gtk::TreeModel::Row s_row = *(_tm_inspect->append(i_row.children())); - s_row[_records.name] = "signal: " + (*is)->get("name"); - } - } - - ::DBus::Xml::Nodes nodes = root["node"]; - - for (::DBus::Xml::Nodes::iterator in = nodes.begin(); in != nodes.end(); ++in) - { - std::string name = (*in)->get("name"); - - Gtk::TreeModel::Row n_row = row - ? *(_tm_inspect->append(row->children())) - : *(_tm_inspect->append()); - n_row[_records.name] = name; - - _inspect_append(&n_row, buspath + "/" + name, busname); - } -} - -DBus::Glib::BusDispatcher dispatcher; - -int main(int argc, char *argv[]) -{ - Gtk::Main kit(argc, argv); - - DBus::default_dispatcher = &dispatcher; - - dispatcher.attach(NULL); - - DBus::Connection conn = DBus::Connection::SessionBus(); - - DBusBrowser browser(conn); - - Gtk::Main::run(browser); - - return 0; -} diff --git a/sflphone-common/libs/dbus-c++/examples/glib/dbus-browser.h b/sflphone-common/libs/dbus-c++/examples/glib/dbus-browser.h deleted file mode 100644 index 9bbefbf084d9188376439b36e4294653f7787660..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/glib/dbus-browser.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef __DEMO_DBUS_BROWSER_H -#define __DEMO_DBUS_BROWSER_H - -#include <dbus-c++/dbus.h> -#include <dbus-c++/glib-integration.h> -#include <gtkmm.h> - -#include "dbus-glue.h" - -class DBusInspector -: public DBus::IntrospectableProxy, - public DBus::ObjectProxy -{ -public: - - DBusInspector(DBus::Connection &conn, const char *path, const char *service) - : DBus::ObjectProxy(conn, path, service) - {} -}; - -class DBusBrowser -: public org::freedesktop::DBus_proxy, - public DBus::IntrospectableProxy, - public DBus::ObjectProxy, - public Gtk::Window -{ -public: - - DBusBrowser(::DBus::Connection &); - -private: - - void NameOwnerChanged(const std::string &, const std::string &, const std::string &); - - void NameLost(const std::string &); - - void NameAcquired(const std::string &); - - void on_select_busname(); - - void _inspect_append(Gtk::TreeModel::Row *, const std::string &, const std::string &); - -private: - - class InspectRecord : public Gtk::TreeModel::ColumnRecord - { - public: - - InspectRecord() { add(name); } - - Gtk::TreeModelColumn<Glib::ustring> name; - }; - - Gtk::VBox _vbox; - Gtk::ScrolledWindow _sc_tree; - Gtk::ComboBoxText _cb_busnames; - Gtk::TreeView _tv_inspect; - Glib::RefPtr<Gtk::TreeStore> _tm_inspect; - InspectRecord _records; -}; - -#endif//__DEMO_DBUS_BROWSER_H diff --git a/sflphone-common/libs/dbus-c++/examples/hal/Makefile.am b/sflphone-common/libs/dbus-c++/examples/hal/Makefile.am deleted file mode 100644 index 22868c80fa8c8bb5e5579ce4089c09b8044e401a..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/hal/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = hal-listen - -hal_listen_SOURCES = hal-listen.h hal-listen.cpp -hal_listen_LDADD = $(top_builddir)/src/libdbus-c++-1.la - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/sflphone-common/libs/dbus-c++/examples/hal/hal-listen.cpp b/sflphone-common/libs/dbus-c++/examples/hal/hal-listen.cpp deleted file mode 100644 index 1939f8a1573d351ddd4ac8c333accd356d016925..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/hal/hal-listen.cpp +++ /dev/null @@ -1,129 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "hal-listen.h" - -#include <signal.h> -#include <iostream> - -HalManagerProxy::HalManagerProxy(DBus::Connection &connection) -: DBus::InterfaceProxy("org.freedesktop.Hal.Manager"), - DBus::ObjectProxy(connection, "/org/freedesktop/Hal/Manager", "org.freedesktop.Hal") -{ - connect_signal(HalManagerProxy, DeviceAdded, DeviceAddedCb); - connect_signal(HalManagerProxy, DeviceRemoved, DeviceRemovedCb); - - std::vector< std::string > devices = GetAllDevices(); - - std::vector< std::string >::iterator it; - for (it = devices.begin(); it != devices.end(); ++it) - { - DBus::Path udi = *it; - - std::cout << "found device " << udi << std::endl; - - _devices[udi] = new HalDeviceProxy(connection, udi); - } -} - -std::vector< std::string > HalManagerProxy::GetAllDevices() -{ - std::vector< std::string > udis; - DBus::CallMessage call; - - call.member("GetAllDevices"); - - DBus::Message reply = invoke_method(call); - DBus::MessageIter it = reply.reader(); - - it >> udis; - return udis; -} - -void HalManagerProxy::DeviceAddedCb(const DBus::SignalMessage &sig) -{ - DBus::MessageIter it = sig.reader(); - std::string devname; - - it >> devname; - - DBus::Path udi(devname); - - _devices[devname] = new HalDeviceProxy(conn(), udi); - std::cout << "added device " << udi << std::endl; -} - -void HalManagerProxy::DeviceRemovedCb(const DBus::SignalMessage &sig) -{ - DBus::MessageIter it = sig.reader(); - std::string devname; - - it >> devname; - - std::cout << "removed device " << devname << std::endl; - - _devices.erase(devname); -} - -HalDeviceProxy::HalDeviceProxy(DBus::Connection &connection, DBus::Path &udi) -: DBus::InterfaceProxy("org.freedesktop.Hal.Device"), - DBus::ObjectProxy(connection, udi, "org.freedesktop.Hal") -{ - connect_signal(HalDeviceProxy, PropertyModified, PropertyModifiedCb); - connect_signal(HalDeviceProxy, Condition, ConditionCb); -} - -void HalDeviceProxy::PropertyModifiedCb(const DBus::SignalMessage &sig) -{ - typedef DBus::Struct< std::string, bool, bool > HalProperty; - - DBus::MessageIter it = sig.reader(); - int32_t number; - - it >> number; - - DBus::MessageIter arr = it.recurse(); - - for (int i = 0; i < number; ++i, ++arr) - { - HalProperty hp; - - arr >> hp; - - std::cout << "modified property " << hp._1 << " in " << path() << std::endl; - } -} - -void HalDeviceProxy::ConditionCb(const DBus::SignalMessage &sig) -{ - DBus::MessageIter it = sig.reader(); - std::string condition; - - it >> condition; - - std::cout << "encountered condition " << condition << " in " << path() << std::endl; -} - -DBus::BusDispatcher dispatcher; - -void niam(int sig) -{ - dispatcher.leave(); -} - -int main() -{ - signal(SIGTERM, niam); - signal(SIGINT, niam); - - DBus::default_dispatcher = &dispatcher; - - DBus::Connection conn = DBus::Connection::SystemBus(); - - HalManagerProxy hal(conn); - - dispatcher.enter(); - - return 0; -} diff --git a/sflphone-common/libs/dbus-c++/examples/hal/hal-listen.h b/sflphone-common/libs/dbus-c++/examples/hal/hal-listen.h deleted file mode 100644 index 12862e617e9e97679bbd403cba6f68122004e6c0..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/hal/hal-listen.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef __DEMO_HAL_LISTEN_H -#define __DEMO_HAL_LISTEN_H - -#include <dbus-c++/dbus.h> -#include <vector> -#include <map> - -class HalDeviceProxy; - -class HalManagerProxy -: public DBus::InterfaceProxy, - public DBus::ObjectProxy -{ -public: - - HalManagerProxy(DBus::Connection &connection); - - std::vector< std::string > GetAllDevices(); - -private: - - void DeviceAddedCb(const DBus::SignalMessage &sig); - - void DeviceRemovedCb(const DBus::SignalMessage &sig); - - std::map< std::string, DBus::RefPtr< HalDeviceProxy > > _devices; -}; - -class HalDeviceProxy -: public DBus::InterfaceProxy, - public DBus::ObjectProxy -{ -public: - - HalDeviceProxy(DBus::Connection &connection, DBus::Path &udi); - -private: - - void PropertyModifiedCb(const DBus::SignalMessage &sig); - - void ConditionCb(const DBus::SignalMessage &sig); -}; - -#endif//__DEMO_HAL_LISTEN_H diff --git a/sflphone-common/libs/dbus-c++/examples/properties/Makefile.am b/sflphone-common/libs/dbus-c++/examples/properties/Makefile.am deleted file mode 100644 index a99749a19f191c29b6d6b350e32449b871b5135b..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/properties/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -EXTRA_DIST = propsgs-introspect.xml - -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include - -noinst_PROGRAMS = propsgs-server propsgs-client - -propsgs_server_SOURCES = propsgs-glue-adaptor.h propsgs-server.h propsgs-server.cpp -propsgs_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la - -propsgs_client_SOURCES = propsgs-glue-proxy.h propsgs-client.h propsgs-client.cpp -propsgs_client_LDADD = $(top_builddir)/src/libdbus-c++-1.la -lpthread - -propsgs-glue-adaptor.h: propsgs-introspect.xml - $(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@ -- - -propsgs-glue-proxy.h: propsgs-introspect.xml - $(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@ -- - -BUILT_SOURCES = propsgs-glue-adaptor.h propsgs-glue-proxy.h -CLEANFILES = $(BUILT_SOURCES) - -dist-hook: - cd $(distdir); rm -f $(BUILT_SOURCES) - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-client.cpp b/sflphone-common/libs/dbus-c++/examples/properties/propsgs-client.cpp deleted file mode 100644 index d4b51f4bd258afdacd966b613456ad4e8b572599..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-client.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include "propsgs-client.h" -#include <iostream> -#include <signal.h> -#include <pthread.h> - -using namespace org::freedesktop::DBus; - -static const char *PROPS_SERVER_NAME = "org.freedesktop.DBus.Examples.Properties"; -static const char *PROPS_SERVER_PATH = "/org/freedesktop/DBus/Examples/Properties"; - -PropsClient::PropsClient(DBus::Connection &connection, const char *path, const char *name) -: DBus::ObjectProxy(connection, path, name) -{ -} - -void PropsClient::MessageChanged(const std::string& message) -{ - std::cout << "MessageChanged signal, new value: " << message << "\n"; -}; - -void PropsClient::DataChanged(const double& data) -{ - std::cout << "DataChanged signal, new value:" << data << "\n"; -}; - -void *test_property_proxy(void * input) -{ - PropsClient *client = static_cast<PropsClient*>(input); - - std::cout << "read property 'Version', value:" << client->Version() << "\n"; - - std::cout << "read property 'Message', value:" << client->Message() << "\n"; - - client->Message("message set by property access"); - std::cout << "wrote property 'Message'\n"; - - std::cout << "read property 'Message', value:" << client->Message() << "\n"; - - client->Data(1.1); - std::cout << "wrote property 'Data'\n"; - - return NULL; -} - -DBus::BusDispatcher dispatcher; - -void niam(int sig) -{ - dispatcher.leave(); - pthread_exit(NULL); -} - -int main() -{ - signal(SIGTERM, niam); - signal(SIGINT, niam); - - DBus::default_dispatcher = &dispatcher; - - DBus::_init_threading(); - - DBus::Connection conn = DBus::Connection::SessionBus(); - - PropsClient client (conn, PROPS_SERVER_PATH, PROPS_SERVER_NAME); - - pthread_t thread; - pthread_create(&thread, NULL, test_property_proxy, &client); - - dispatcher.enter(); - - return 0; -} diff --git a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-client.h b/sflphone-common/libs/dbus-c++/examples/properties/propsgs-client.h deleted file mode 100644 index 99b70c500c4f9098c691ba6e11ef58a74349decc..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-client.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef __DEMO_PROPS_SERVER_H -#define __DEMO_PROPS_SERVER_H - -#include <dbus-c++/dbus.h> -#include "propsgs-glue-proxy.h" - -class PropsClient -: public org::freedesktop::DBus::PropsGSDemo_proxy, - public DBus::IntrospectableProxy, - public DBus::PropertiesProxy, - public DBus::ObjectProxy -{ -public: - - PropsClient(DBus::Connection &connection, const char *path, const char *name); - - void MessageChanged(const std::string& message); - - void DataChanged(const double& data); -}; - -#endif//__DEMO_PROPS_SERVER_H diff --git a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-introspect.xml b/sflphone-common/libs/dbus-c++/examples/properties/propsgs-introspect.xml deleted file mode 100644 index 10459308fc3b0e5118e09dcefe6d6241eadc4b46..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-introspect.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" ?> -<node name="/org/freedesktop/DBus/Examples/Properties"> - <interface name="org.freedesktop.DBus.PropsGSDemo"> - <property name="Version" type="i" access="read"/> - <property name="Message" type="s" access="readwrite"/> - <property name="Data" type="d" access="write"/> - <signal name="MessageChanged"> - <arg name="message" type="s"/> - </signal> - <signal name="DataChanged"> - <arg name="Data" type="d"/> - </signal> - </interface> -</node> diff --git a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-server.cpp b/sflphone-common/libs/dbus-c++/examples/properties/propsgs-server.cpp deleted file mode 100644 index c3ff23f645bc6d986f05ed0d894b3de998596d7f..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-server.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "propsgs-server.h" -#include <iostream> -#include <signal.h> - -static const char *PROPS_SERVER_NAME = "org.freedesktop.DBus.Examples.Properties"; -static const char *PROPS_SERVER_PATH = "/org/freedesktop/DBus/Examples/Properties"; - -PropsServer::PropsServer(DBus::Connection &connection) -: DBus::ObjectAdaptor(connection, PROPS_SERVER_PATH) -{ - Version = 1; - Message = "default message"; -} - -void PropsServer::on_set_property - (DBus::InterfaceAdaptor &interface, const std::string &property, const DBus::Variant &value) -{ - if (property == "Message") - { - std::cout << "'Message' has been changed\n"; - - std::string msg = value; - this->MessageChanged(msg); - } - if (property == "Data") - { - std::cout << "'Data' has been changed\n"; - - double data = value; - this->DataChanged(data); - } -} - -DBus::BusDispatcher dispatcher; - -void niam(int sig) -{ - dispatcher.leave(); -} - -int main() -{ - signal(SIGTERM, niam); - signal(SIGINT, niam); - - DBus::default_dispatcher = &dispatcher; - - DBus::Connection conn = DBus::Connection::SessionBus(); - conn.request_name(PROPS_SERVER_NAME); - - PropsServer server(conn); - - dispatcher.enter(); - - return 0; -} diff --git a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-server.h b/sflphone-common/libs/dbus-c++/examples/properties/propsgs-server.h deleted file mode 100644 index a3169d629f9c857bd4a307c3a54e34b3886a8ae6..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/examples/properties/propsgs-server.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef __DEMO_PROPS_SERVER_H -#define __DEMO_PROPS_SERVER_H - -#include <dbus-c++/dbus.h> -#include "propsgs-glue-adaptor.h" - -class PropsServer -: public org::freedesktop::DBus::PropsGSDemo_adaptor, - public DBus::IntrospectableAdaptor, - public DBus::PropertiesAdaptor, - public DBus::ObjectAdaptor -{ -public: - - PropsServer(DBus::Connection &connection); - - void on_set_property - (DBus::InterfaceAdaptor &interface, const std::string &property, const DBus::Variant &value); -}; - -#endif//__DEMO_PROPS_SERVER_H diff --git a/sflphone-common/libs/dbus-c++/libdbus-c++.spec.in b/sflphone-common/libs/dbus-c++/libdbus-c++.spec.in deleted file mode 100644 index 4b2db1ebb4139b1d11ae9968f768af4b70e0ae93..0000000000000000000000000000000000000000 --- a/sflphone-common/libs/dbus-c++/libdbus-c++.spec.in +++ /dev/null @@ -1,63 +0,0 @@ - - - - -Summary: C++ Interface for DBus -Name: libdbus-c++ -Version: @PACKAGE_VERSION@ -Release: 70001 -URL: http://dev.openwengo.org/trac/openwengo/trac.fcgi/browser/wengophone-ng/branches/wengophone-dbus-api/libs/dbus/src -Source0: %{name}-%{version}.tar.gz -License: LGPL -Group: Libraries -BuildRoot: %{_tmppath}/%{name}-root -Prefix: /usr - -%description - -Ability to reflect dbus methods and signals into a more natural C++ object system. - -%package devel -Requires: libdbus-c++ = %{version} -Group: Development/Libraries -Summary: Header files for libdbus-c++ - -%description devel -Header files for libdbus-c++ - - -%prep -%setup -q - -%build -./configure --prefix=/usr -make -j 4 - -%install -make prefix=$RPM_BUILD_ROOT%{prefix} install - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(755,root,root) -%{prefix}/lib/libdbus-c++*.so* - - - -%files devel -%defattr(-,root,root) -%{prefix}/bin/dbusxx-xml2cpp -%{prefix}/bin/dbusxx-introspect -%{prefix}/lib/libdbus-c*.a -%{prefix}/lib/libdbus-c*.la -%{prefix}/include/dbus-c++-1 -%{prefix}/lib/pkgconfig/*.pc - -%changelog -* Thu Feb 8 2007 Ben Martin -- initial spec file