X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnotifier.c;h=b328a2adbfaae03f371739324d30893fc51c759b;hb=4b96f83edbbdee63a6ef03e8d3e0d87f536acb31;hp=f9905be5dc8b28ead2513e4c1e12ab9fa6531bc7;hpb=be2a6dd63f4314f2844349ac0467b985b5fdb084;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/notifier.c b/src/notifier.c index f9905be..b328a2a 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -136,7 +136,7 @@ static void state_changed(void) connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, CONNMAN_MANAGER_INTERFACE, "State", - DBUS_TYPE_STRING, ¬ifier_state); + DBUS_TYPE_STRING, ¬ifier_state); } static void technology_connected(enum connman_service_type type, @@ -171,7 +171,7 @@ void __connman_notifier_connect(enum connman_service_type type) technology_connected(type, TRUE); } -void __connman_notifier_online(enum connman_service_type type) +void __connman_notifier_enter_online(enum connman_service_type type) { DBG("type %d", type); @@ -179,8 +179,15 @@ void __connman_notifier_online(enum connman_service_type type) state_changed(); } -void __connman_notifier_disconnect(enum connman_service_type type, - enum connman_service_state old_state) +void __connman_notifier_leave_online(enum connman_service_type type) +{ + DBG("type %d", type); + + if (__sync_fetch_and_sub(&online[type], 1) == 1) + state_changed(); +} + +void __connman_notifier_disconnect(enum connman_service_type type) { DBG("type %d", type); @@ -205,35 +212,16 @@ void __connman_notifier_disconnect(enum connman_service_type type, break; } - if (old_state == CONNMAN_SERVICE_STATE_ONLINE) - __sync_fetch_and_sub(&online[type], 1); - if (__sync_fetch_and_sub(&connected[type], 1) != 1) return; technology_connected(type, FALSE); } -static void technology_default(enum connman_service_type type) -{ - const char *str; - - str = __connman_service_type2string(type); - if (str == NULL) - str = ""; - - connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "DefaultTechnology", - DBUS_TYPE_STRING, &str); -} - void __connman_notifier_default_changed(struct connman_service *service) { - enum connman_service_type type = connman_service_get_type(service); GSList *list; - technology_default(type); - for (list = notifier_list; list; list = list->next) { struct connman_notifier *notifier = list->data;