[ekiga/ds-gtk-application] Avahi: Fixed and enabled plugin by default.

[Damien Sandras <dsandras src gnome org>]

commit 7bb8fc94353a0e01773c241aa68d1399d294ee12
Author: Damien Sandras <dsandras seconix com>
Date:   Sun Dec 7 16:47:27 2014 +0100

    Avahi: Fixed and enabled plugin by default.

 configure.ac                       |    4 ++--
 lib/engine/protocol/call-manager.h |    1 +
 plugins/avahi/Makefile.am          |    2 ++
 plugins/avahi/avahi-heap.cpp       |    4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c57982e..3d85791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -473,10 +473,10 @@ dnl ###############################
 AVAHI="disabled"
 
 if test "x${gm_platform}" != "xmingw" ; then
-  AC_ARG_ENABLE(avahi, AS_HELP_STRING([--enable-avahi],[enable mDNS support (default is disabled)]),
+  AC_ARG_ENABLE(avahi, AS_HELP_STRING([--enable-avahi],[enable mDNS support (default is enabled)]),
 [if test "x$enableval" = "xyes"; then
   enable_avahi=yes
-fi],)
+fi],enable_avahi=yes)
 
   if test "x$enable_avahi" = "xyes"; then
     PKG_CHECK_MODULES([AVAHI], [avahi-client >= 0.6 avahi-glib >= 0.6], [found_avahi=yes])
diff --git a/lib/engine/protocol/call-manager.h b/lib/engine/protocol/call-manager.h
index 66d039a..698e17a 100644
--- a/lib/engine/protocol/call-manager.h
+++ b/lib/engine/protocol/call-manager.h
@@ -47,6 +47,7 @@
 
 #include "call-protocol-manager.h"
 #include "codec-description.h"
+#include "contact-core.h" // FIXME: required for 'message'. Should disappear.
 
 namespace Ekiga
 {
diff --git a/plugins/avahi/Makefile.am b/plugins/avahi/Makefile.am
index fa6701f..f57626d 100644
--- a/plugins/avahi/Makefile.am
+++ b/plugins/avahi/Makefile.am
@@ -2,9 +2,11 @@ plugin_LTLIBRARIES = libgmavahi.la
 
 AM_CXXFLAGS = \
        $(BOOST_CPPFLAGS) $(AVAHI_CFLAGS) \
+       -I$(top_srcdir)/lib/engine/action \
        -I$(top_srcdir)/lib/engine/framework \
        -I$(top_srcdir)/lib/engine/account \
        -I$(top_srcdir)/lib/engine/presence \
+       -I$(top_srcdir)/lib/engine/addressbook \
        -I$(top_srcdir)/lib/engine/protocol
 
 libgmavahi_la_SOURCES = \
diff --git a/plugins/avahi/avahi-heap.cpp b/plugins/avahi/avahi-heap.cpp
index e7b324f..3031a7f 100644
--- a/plugins/avahi/avahi-heap.cpp
+++ b/plugins/avahi/avahi-heap.cpp
@@ -373,9 +373,9 @@ Avahi::Heap::ResolverCallback (AvahiServiceResolver *resolver,
       boost::shared_ptr<Ekiga::PresenceCore> pcore = presence_core.lock ();
       if (broken != NULL && broken[0] != NULL && broken[1] != NULL && pcore) {
 
-       std::set<std::string> groups;
+       std::list<std::string> groups;
 
-       groups.insert (_("Neighbours"));
+       groups.push_back (_("Neighbours"));
        url = g_strdup_printf ("%s:neighbour %s:%d", broken[1], host_name, port);
        boost::shared_ptr<Ekiga::URIPresentity> presentity (new Ekiga::URIPresentity (pcore, name, url, 
groups));
        status_received (url, status);