[Telepathy-commits] [telepathy-salut/master] salut-avahi-contact: fix multi variables declarations

[Guillaume Desmottes]

---
 src/Makefile.am           |    3 +--
 src/salut-avahi-contact.c |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index ee25ae5..3ad85bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -180,7 +180,6 @@ signals-marshal.h: signals-marshal.list
 signals-marshal.c: signals-marshal.list
 	glib-genmarshal --body --prefix=salut_signals_marshal $< > $@
 
-
 # rules for making the glib enum objects
 %-enumtypes.h: %.h Makefile.in
 	glib-mkenums \
@@ -192,7 +191,7 @@ signals-marshal.c: signals-marshal.list
 
 %-enumtypes.c: %.h Makefile.in
 	glib-mkenums \
-	--fhead "#include <$*.h>" \
+	--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
 	--vhead "GType\n at enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G at Type@Value values[] = {"     \
 	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \
diff --git a/src/salut-avahi-contact.c b/src/salut-avahi-contact.c
index d9f8401..8904b96 100644
--- a/src/salut-avahi-contact.c
+++ b/src/salut-avahi-contact.c
@@ -145,7 +145,7 @@ salut_avahi_contact_set_property (GObject *object,
 static void
 _avahi_address_to_sockaddr (AvahiAddress *address,
                             guint16 port,
-                            AvahiIfIndex index,
+                            AvahiIfIndex index_,
                             struct sockaddr *sockaddr)
 {
   switch (address->proto)
@@ -167,7 +167,7 @@ _avahi_address_to_sockaddr (AvahiAddress *address,
           memcpy (sockaddr6->sin6_addr.s6_addr, address->data.ipv6.address, 16);
 
           sockaddr6->sin6_flowinfo = 0;
-          sockaddr6->sin6_scope_id = index;
+          sockaddr6->sin6_scope_id = index_;
           break;
        }
     default:
-- 
1.5.6.5