From 5892d5d0333c4f98224b1402c2d08eb808909623 Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Mon, 21 May 2012 16:01:35 +0300 Subject: [PATCH] service: Fix Domains property The service Domains property shows Domains.Configuration if set, otherwise the domain name given by DHCP or provider. Fixes BMC#25122 --- src/service.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/service.c b/src/service.c index e2f1f57..9220ad9 100644 --- a/src/service.c +++ b/src/service.c @@ -1515,32 +1515,32 @@ static void append_tsconfig(DBusMessageIter *iter, void *user_data) } } -static void append_domain(DBusMessageIter *iter, void *user_data) +static void append_domainconfig(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; + int i; - if (is_connected(service) == FALSE && - is_connecting(service) == FALSE) - return; - - if (service->domainname == NULL) + if (service->domains == NULL) return; - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &service->domainname); + for (i = 0; service->domains[i]; i++) + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &service->domains[i]); } -static void append_domainconfig(DBusMessageIter *iter, void *user_data) +static void append_domain(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - int i; - if (service->domains == NULL) + if (is_connected(service) == FALSE && + is_connecting(service) == FALSE) return; - for (i = 0; service->domains[i]; i++) + if (service->domains != NULL) + append_domainconfig(iter, user_data); + else if (service->domainname != NULL) dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &service->domains[i]); + DBUS_TYPE_STRING, &service->domainname); } static void append_proxies(DBusMessageIter *iter, void *user_data) -- 2.7.4