Merge branch 'sip_dev' of ssh://yun@192.168.1.16/home-local/manu/dev/sfl/sflphone into yun-pjsip

libs/dbus-c++/examples/echo/echo-introspect.xml

+<?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>

libs/dbus-c++/examples/echo/echo-server.h

+#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

libs/dbus-c++/examples/hal/Makefile.am

+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