[PATCH v6 14/20] notify: Add service name parameter to service_add()

[Daniel Wagner]

From: Daniel Wagner <daniel.wag...@bmw-carit.de>

---
 include/notifier.h |    3 ++-
 src/connman.h      |    3 ++-
 src/notifier.c     |    5 +++--
 src/service.c      |    4 ++--
 src/session.c      |    3 ++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/notifier.h b/include/notifier.h
index 7ac7c99..c42f9be 100644
--- a/include/notifier.h
+++ b/include/notifier.h
@@ -43,7 +43,8 @@ struct connman_notifier {
        const char *name;
        int priority;
        void (*default_changed) (struct connman_service *service);
-       void (*service_add) (struct connman_service *service);
+       void (*service_add) (struct connman_service *service,
+                               const char *name);
        void (*service_remove) (struct connman_service *service);
        void (*service_enabled) (enum connman_service_type type,
                                                connman_bool_t enabled);
diff --git a/src/connman.h b/src/connman.h
index 9cda193..f320667 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -602,7 +602,8 @@ void __connman_notifier_list_connected(DBusMessageIter 
*iter, void *user_data);
 
 void __connman_notifier_register(enum connman_service_type type);
 void __connman_notifier_unregister(enum connman_service_type type);
-void __connman_notifier_service_add(struct connman_service *service);
+void __connman_notifier_service_add(struct connman_service *service,
+                                       const char *name);
 void __connman_notifier_service_remove(struct connman_service *service);
 void __connman_notifier_enable(enum connman_service_type type);
 void __connman_notifier_disable(enum connman_service_type type);
diff --git a/src/notifier.c b/src/notifier.c
index 3d83e43..f6d9b00 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -400,7 +400,8 @@ void __connman_notifier_default_changed(struct 
connman_service *service)
        }
 }
 
-void __connman_notifier_service_add(struct connman_service *service)
+void __connman_notifier_service_add(struct connman_service *service,
+                                       const char *name)
 {
        GSList *list;
 
@@ -408,7 +409,7 @@ void __connman_notifier_service_add(struct connman_service 
*service)
                struct connman_notifier *notifier = list->data;
 
                if (notifier->service_add)
-                       notifier->service_add(service);
+                       notifier->service_add(service, name);
        }
 }
 
diff --git a/src/service.c b/src/service.c
index ac94955..d171e4b 100644
--- a/src/service.c
+++ b/src/service.c
@@ -4918,7 +4918,7 @@ struct connman_service * 
__connman_service_create_from_network(struct connman_ne
                        __connman_service_auto_connect();
        }
 
-       __connman_notifier_service_add(service);
+       __connman_notifier_service_add(service, service->name);
 
        return service;
 }
@@ -5049,7 +5049,7 @@ __connman_service_create_from_provider(struct 
connman_provider *provider)
 
        service_register(service);
 
-       __connman_notifier_service_add(service);
+       __connman_notifier_service_add(service, service->name);
 
        return service;
 }
diff --git a/src/session.c b/src/session.c
index eae623e..99fdf3b 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1565,7 +1565,8 @@ void __connman_session_set_mode(connman_bool_t enable)
                __connman_service_disconnect_all();
 }
 
-static void service_add(struct connman_service *service)
+static void service_add(struct connman_service *service,
+                       const char *name)
 {
        GHashTableIter iter;
        GSequenceIter *iter_service_list;
-- 
1.7.6

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman