Use helper for basic property changed signals

diff --git a/src/device.c b/src/device.c
index 0c5e418..8c0417d 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -193,23 +193,11 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
        return CONNMAN_SERVICE_TYPE_UNKNOWN;
 }
 
-static int powered_changed(struct connman_device *device)
+static void powered_changed(struct connman_device *device)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
-       signal = dbus_message_new_signal(device->element.path,
-                               CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return -ENOMEM;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "Powered",
+       connman_dbus_property_changed_basic(device->element.path,
+                               CONNMAN_DEVICE_INTERFACE, "Powered",
                                        DBUS_TYPE_BOOLEAN, &device->powered);
-
-       g_dbus_send_message(connection, signal);
-
-       return 0;
 }
 
 static int set_powered(struct connman_device *device, connman_bool_t powered)
@@ -1243,19 +1231,9 @@ void __connman_device_cleanup_networks(struct connman_device *device)
 
 static void scanning_changed(struct connman_device *device)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
-       signal = dbus_message_new_signal(device->element.path,
-                               CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "Scanning",
+       connman_dbus_property_changed_basic(device->element.path,
+                               CONNMAN_DEVICE_INTERFACE, "Scanning",
                                        DBUS_TYPE_BOOLEAN, &device->scanning);
-
-       g_dbus_send_message(connection, signal);
 }
 
 static void mark_network_available(gpointer key, gpointer value,

diff --git a/src/element.c b/src/element.c
index ec494b1..0931f93 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -1255,19 +1255,10 @@ static void emit_state_change(DBusConnection *conn, const char *state)
        DBusMessage *signal;
        DBusMessageIter iter;
 
-       DBG("conn %p", conn);
-
-       signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
-                               CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "State",
+       connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH,
+                               CONNMAN_MANAGER_INTERFACE, "State",
                                                DBUS_TYPE_STRING, &state);
 
-       g_dbus_send_message(conn, signal);
-
        signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
                                CONNMAN_MANAGER_INTERFACE, "StateChanged");
        if (signal == NULL)

diff --git a/src/network.c b/src/network.c
index a89897f..231db87 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -756,9 +756,6 @@ static gboolean set_connected(gpointer user_data)
 int connman_network_set_connected(struct connman_network *network,
                                                connman_bool_t connected)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
        DBG("network %p connected %d", network, connected);
 
        if ((network->connecting == TRUE || network->associating == TRUE) &&
@@ -778,16 +775,9 @@ int connman_network_set_connected(struct connman_network *network,
                return 0;
        }
 
-       signal = dbus_message_new_signal(network->element.path,
-                               CONNMAN_NETWORK_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return 0;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "Connected",
-                                       DBUS_TYPE_BOOLEAN, &connected);
-
-       g_dbus_send_message(connection, signal);
+       connman_dbus_property_changed_basic(network->element.path,
+                               CONNMAN_NETWORK_INTERFACE, "Connected",
+                                               DBUS_TYPE_BOOLEAN, &connected);
 
        set_connected(network);
 

diff --git a/src/notifier.c b/src/notifier.c
index 768da7f..9b6fbcf 100644 (file)
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -324,24 +324,15 @@ void __connman_notifier_disconnect(enum connman_service_type type)
 
 static void technology_default(enum connman_service_type type)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
        const char *str;
 
        str = __connman_service_type2string(type);
        if (str == NULL)
                str = "";
 
-       signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
-                               CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "DefaultTechnology",
+       connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH,
+                       CONNMAN_MANAGER_INTERFACE, "DefaultTechnology",
                                                DBUS_TYPE_STRING, &str);
-
-       g_dbus_send_message(connection, signal);
 }
 
 void __connman_notifier_default_changed(struct connman_service *service)
@@ -361,21 +352,11 @@ void __connman_notifier_default_changed(struct connman_service *service)
 
 static void offlinemode_changed(dbus_bool_t enabled)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
        DBG("enabled %d", enabled);
 
-       signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
-                               CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "OfflineMode",
-                                       DBUS_TYPE_BOOLEAN, &enabled);
-
-       g_dbus_send_message(connection, signal);
+       connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH,
+                               CONNMAN_MANAGER_INTERFACE, "OfflineMode",
+                                               DBUS_TYPE_BOOLEAN, &enabled);
 }
 
 void __connman_notifier_offlinemode(connman_bool_t enabled)

diff --git a/src/profile.c b/src/profile.c
index 84059fc..9e2c0c1 100644 (file)
--- a/src/profile.c
+++ b/src/profile.c
@@ -81,40 +81,16 @@ static void profiles_changed(void)
 
 static void name_changed(struct connman_profile *profile)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
-       DBG("profile %p", profile);
-
-       signal = dbus_message_new_signal(profile->path,
-                               CONNMAN_PROFILE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "Name",
+       connman_dbus_property_changed_basic(profile->path,
+                               CONNMAN_PROFILE_INTERFACE, "Name",
                                        DBUS_TYPE_STRING, &profile->name);
-
-       g_dbus_send_message(connection, signal);
 }
 
 static void offlinemode_changed(struct connman_profile *profile)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
-       DBG("profile %p", profile);
-
-       signal = dbus_message_new_signal(profile->path,
-                               CONNMAN_PROFILE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "OfflineMode",
+       connman_dbus_property_changed_basic(profile->path,
+                               CONNMAN_PROFILE_INTERFACE, "OfflineMode",
                                DBUS_TYPE_BOOLEAN, &profile->offlinemode);
-
-       g_dbus_send_message(connection, signal);
 }
 
 connman_bool_t __connman_profile_get_offlinemode(void)

diff --git a/src/provider.c b/src/provider.c
index 9a99424..28acad8 100644 (file)
--- a/src/provider.c
+++ b/src/provider.c
@@ -188,27 +188,15 @@ static int provider_probe(struct connman_provider *provider)
 
 static void state_changed(struct connman_provider *provider)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
        const char *str;
 
-       if (provider->path == NULL)
-               return;
-
        str = state2string(provider->state);
        if (str == NULL)
                return;
 
-       signal = dbus_message_new_signal(provider->path,
-                       CONNMAN_PROVIDER_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "State",
+       connman_dbus_property_changed_basic(provider->path,
+                               CONNMAN_PROVIDER_INTERFACE, "State",
                                                DBUS_TYPE_STRING, &str); 
-
-       g_dbus_send_message(connection, signal);
 }
 
 static void reply_pending(struct connman_provider *provider, int error)

diff --git a/src/service.c b/src/service.c
index bfc2018..1a1a93e 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -269,126 +269,65 @@ const char *__connman_service_default(void)
 
 static void mode_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
        const char *str;
 
-       if (service->path == NULL)
-               return;
-
        str = mode2string(service->mode);
        if (str == NULL)
                return;
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "Mode",
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "Mode",
                                                DBUS_TYPE_STRING, &str);
-
-       g_dbus_send_message(connection, signal);
 }
 
 static void state_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
        const char *str;
 
-       if (service->path == NULL)
-               return;
-
        str = state2string(service->state);
        if (str == NULL)
                return;
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "State",
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "State",
                                                DBUS_TYPE_STRING, &str);
-
-       g_dbus_send_message(connection, signal);
 }
 
 static void strength_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
-       if (service->path == NULL)
-               return;
-
        if (service->strength == 0)
                return;
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "Strength",
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "Strength",
                                        DBUS_TYPE_BYTE, &service->strength);
+}
 
-       g_dbus_send_message(connection, signal);
+static void favorite_changed(struct connman_service *service)
+{
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "Favorite",
+                                       DBUS_TYPE_BOOLEAN, &service->favorite);
 }
 
 static void roaming_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
-       if (service->path == NULL)
-               return;
-
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "Roaming",
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "Roaming",
                                        DBUS_TYPE_BOOLEAN, &service->roaming);
-
-       g_dbus_send_message(connection, signal);
 }
 
 static void autoconnect_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
-       if (service->path == NULL)
-               return;
-
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "AutoConnect",
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "AutoConnect",
                                DBUS_TYPE_BOOLEAN, &service->autoconnect);
-
-       g_dbus_send_message(connection, signal);
 }
 
 static void passphrase_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
        dbus_bool_t required;
 
-       if (service->path == NULL)
-               return;
-
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
        case CONNMAN_SERVICE_TYPE_SYSTEM:
@@ -417,27 +356,15 @@ static void passphrase_changed(struct connman_service *service)
                break;
        }
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "PassphraseRequired",
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "PassphraseRequired",
                                                DBUS_TYPE_BOOLEAN, &required);
-
-       g_dbus_send_message(connection, signal);
 }
 
 static void apn_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter iter;
        dbus_bool_t required;
 
-       if (service->path == NULL)
-               return;
-
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
        case CONNMAN_SERVICE_TYPE_SYSTEM:
@@ -453,16 +380,9 @@ static void apn_changed(struct connman_service *service)
 
        required = (service->apn == NULL) ? TRUE : FALSE;
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "SetupRequired",
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "SetupRequired",
                                                DBUS_TYPE_BOOLEAN, &required);
-
-       g_dbus_send_message(connection, signal);
 }
 
 static DBusMessage *get_properties(DBusConnection *conn,
@@ -1337,26 +1257,6 @@ static gint service_compare(gconstpointer a, gconstpointer b,
        return (gint) service_b->strength - (gint) service_a->strength;
 }
 
-static void favorite_changed(struct connman_service *service)
-{
-       DBusMessage *signal;
-       DBusMessageIter iter;
-
-       if (service->path == NULL)
-               return;
-
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &iter);
-       connman_dbus_property_append_variant(&iter, "Favorite",
-                                       DBUS_TYPE_BOOLEAN, &service->favorite);
-
-       g_dbus_send_message(connection, signal);
-}
-
 /**
  * connman_service_get_type:
  * @service: service structure