* swap order of "type" and "name" arguments of avahi_server_add_service() and friends

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@179 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

3 files changed, 4 insertions, 4 deletions

diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index f0a1a2d..7be5ee0 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -326,8 +326,8 @@ static DBusHandlerResult msg_entry_group_impl(DBusConnection *c, DBusMessage *m,
                 m, &error,
                 DBUS_TYPE_INT32, &interface,
                 DBUS_TYPE_INT32, &protocol,
-                DBUS_TYPE_STRING, &type,
                 DBUS_TYPE_STRING, &name,
+                DBUS_TYPE_STRING, &type,
                 DBUS_TYPE_STRING, &domain,
                 DBUS_TYPE_STRING, &host,
                 DBUS_TYPE_UINT16, &port, 
@@ -346,7 +346,7 @@ static DBusHandlerResult msg_entry_group_impl(DBusConnection *c, DBusMessage *m,
         if (host && !*host)
             host = NULL;
 
-        if (avahi_server_add_service_strlst(avahi_server, i->entry_group, (AvahiIfIndex) interface, (AvahiProtocol) protocol, type, name, domain, host, port, strlst) < 0) {
+        if (avahi_server_add_service_strlst(avahi_server, i->entry_group, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, type, domain, host, port, strlst) < 0) {
             avahi_log_warn("Failed to add service: %s", name);
             return respond_error(c, m, "org.freedesktop.Avahi.InvalidServiceError", NULL);
         } else
diff --git a/avahi-daemon/dbus-test.py b/avahi-daemon/dbus-test.py
index cd708c0..c75faf3 100755
--- a/avahi-daemon/dbus-test.py
+++ b/avahi-daemon/dbus-test.py
@@ -34,7 +34,7 @@ def entry_group_state_changed_callback(t):
 
 g.connect_to_signal('StateChanged', entry_group_state_changed_callback)
 
-g.AddService(0, 0, "_http._tcp", "foo", "", "", dbus.UInt16(4712), ["fuck=hallo", "gurke=mega"])
+g.AddService(0, 0, "Test Web Site", "_http._tcp", "", "", dbus.UInt16(4712), ["fuck=hallo", "gurke=mega"])
 g.AddAddress(0, 0, "foo.local", "47.11.8.15")
 g.Commit()
 
diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c
index 4e97299..59ef7aa 100644
--- a/avahi-daemon/static-services.c
+++ b/avahi-daemon/static-services.c
@@ -210,7 +210,7 @@ static void add_static_service_group_to_server(StaticServiceGroup *g) {
                 avahi_server,
                 g->entry_group,
                 -1, AF_UNSPEC,
-                s->type, g->chosen_name,
+                g->chosen_name, s->type, 
                 s->domain_name, s->host_name, s->port,
                 avahi_string_list_copy(s->txt_records)) < 0) {
             avahi_log_error("Failed to add service '%s' of type '%s', ignoring service group (%s)", g->chosen_name, s->type, g->filename);