Move & Rename PROPERTIES_ARRAY_SIGNATURE

diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index 3e32147..898b823 100644 (file)
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -476,7 +476,8 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
 
        dbus_message_iter_init_append(reply, &iter);
        dbus_message_iter_open_container(&iter,  DBUS_TYPE_ARRAY,
-                                       PROPERTIES_ARRAY_SIGNATURE, &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        dbus_gsm_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH,
                                        &modems);

diff --git a/include/dbus.h b/include/dbus.h
index 738c03a..064f5e9 100644 (file)
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -30,6 +30,12 @@ extern "C" {
 
 #define OFONO_SERVICE  "org.ofono"
 
+/* Essentially a{sv} */
+#define OFONO_PROPERTIES_ARRAY_SIGNATURE DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING \
+                                       DBUS_TYPE_STRING_AS_STRING \
+                                       DBUS_TYPE_VARIANT_AS_STRING \
+                                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING
+
 DBusConnection *ofono_dbus_get_connection();
 
 int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path,

diff --git a/src/call-barring.c b/src/call-barring.c
index dc752ae..9113541 100644 (file)
--- a/src/call-barring.c
+++ b/src/call-barring.c
@@ -257,7 +257,8 @@ static void generate_ss_query_reply(struct ofono_modem *modem)
        dbus_message_iter_append_basic(&vstruct, DBUS_TYPE_STRING, &ss_fac);
 
        dbus_message_iter_open_container(&vstruct, DBUS_TYPE_ARRAY,
-                                       PROPERTIES_ARRAY_SIGNATURE, &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        /* We report all affected locks only for the special case ones */
        if (cb->ss_req_lock <= CB_ALL_END) {
@@ -647,7 +648,8 @@ static void cb_get_properties_reply(struct ofono_modem *modem, int mask)
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                       PROPERTIES_ARRAY_SIGNATURE, &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        for (j = 1; j <= BEARER_CLASS_PAD; j = j << 1) {
                if ((j & mask) == 0)

diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index 01cebb7..9ef460a 100644 (file)
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -387,7 +387,7 @@ static DBusMessage *cf_get_properties_reply(DBusMessage *msg,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
                                                &dict);
 
        for (i = 0; i < 4; i++)
@@ -812,7 +812,7 @@ static DBusMessage *cf_ss_control_reply(struct ofono_modem *modem,
                                        &cf_type);
 
        dbus_message_iter_open_container(&vstruct, DBUS_TYPE_ARRAY,
-                                       PROPERTIES_ARRAY_SIGNATURE, &dict);
+                               OFONO_PROPERTIES_ARRAY_SIGNATURE, &dict);
 
        if (req->cf_type == CALL_FORWARDING_TYPE_UNCONDITIONAL ||
                req->cf_type == CALL_FORWARDING_TYPE_ALL)

diff --git a/src/call-meter.c b/src/call-meter.c
index c751019..a1adb36 100644 (file)
--- a/src/call-meter.c
+++ b/src/call-meter.c
@@ -178,7 +178,8 @@ static void cm_get_properties_reply(struct ofono_modem *modem)
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                       PROPERTIES_ARRAY_SIGNATURE, &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        dbus_gsm_dict_append(&dict, "CallMeter", DBUS_TYPE_UINT32,
                                &cm->call_meter);

diff --git a/src/call-settings.c b/src/call-settings.c
index dcf6a9d..e28b9ea 100644 (file)
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -326,7 +326,8 @@ static void generate_cw_ss_query_reply(struct ofono_modem *modem)
                                        &ss_type);
 
        dbus_message_iter_open_container(&vstruct, DBUS_TYPE_ARRAY,
-                                       PROPERTIES_ARRAY_SIGNATURE, &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        property_append_cw_conditions(&dict, cs->cw, cs->ss_req_cls);
 
@@ -780,8 +781,8 @@ static DBusMessage *generate_get_properties_reply(struct ofono_modem *modem,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
-                                               &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        str = clip_status_to_string(cs->clip);
        dbus_gsm_dict_append(&dict, "CallingLinePresentation",

diff --git a/src/dbus-gsm.h b/src/dbus-gsm.h
index 32417a0..5af654f 100644 (file)
--- a/src/dbus-gsm.h
+++ b/src/dbus-gsm.h
@@ -24,12 +24,6 @@
 
 #define MAX_DBUS_PATH_LEN 64
 
-/* Essentially a{sv} */
-#define PROPERTIES_ARRAY_SIGNATURE DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING \
-                                       DBUS_TYPE_STRING_AS_STRING \
-                                       DBUS_TYPE_VARIANT_AS_STRING \
-                                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING
-
 void dbus_gsm_dict_append(DBusMessageIter *dict, const char *key, int type,
                                void *value);
 

diff --git a/src/manager.c b/src/manager.c
index 1dcd72e..00ebe13 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -137,8 +137,8 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
-                                               &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        dbus_gsm_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH,
                                        &modems);

diff --git a/src/modem.c b/src/modem.c
index 24f62af..6fe13b0 100644 (file)
--- a/src/modem.c
+++ b/src/modem.c
@@ -143,8 +143,8 @@ static DBusMessage *generate_properties_reply(struct ofono_modem *modem,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
-                                               &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        if (info->manufacturer)
                dbus_gsm_dict_append(&dict, "Manufacturer", DBUS_TYPE_STRING,

diff --git a/src/network.c b/src/network.c
index 098ef45..3f747b4 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -509,8 +509,8 @@ static DBusMessage *network_operator_get_properties(DBusConnection *conn,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
-                                               &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        dbus_gsm_dict_append(&dict, "Name", DBUS_TYPE_STRING, &name);
 

diff --git a/src/sim.c b/src/sim.c
index fa35d86..c993089 100644 (file)
--- a/src/sim.c
+++ b/src/sim.c
@@ -145,8 +145,8 @@ static DBusMessage *sim_get_properties(DBusConnection *conn,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
-                                               &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        if (sim->imsi)
                dbus_gsm_dict_append(&dict, "SubscriberIdentity",

diff --git a/src/sms.c b/src/sms.c
index ef15feb..9423764 100644 (file)
--- a/src/sms.c
+++ b/src/sms.c
@@ -139,7 +139,7 @@ static DBusMessage *generate_get_properties_reply(struct ofono_modem *modem,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
                                                &dict);
 
        sca = phone_number_to_string(&sms->sca);
@@ -499,7 +499,7 @@ static void dispatch_text_message(struct ofono_modem *modem,
        dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &message);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
                                                &dict);
 
        ts = sms_scts_to_time(scts, &remote);

diff --git a/src/voicecall.c b/src/voicecall.c
index d8203ac..859374d 100644 (file)
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -165,8 +165,8 @@ static DBusMessage *voicecall_get_properties(DBusConnection *conn,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                               PROPERTIES_ARRAY_SIGNATURE,
-                                               &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        dbus_gsm_dict_append(&dict, "State", DBUS_TYPE_STRING, &status);
 
@@ -708,7 +708,8 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
        dbus_message_iter_init_append(reply, &iter);
 
        dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-                                       PROPERTIES_ARRAY_SIGNATURE, &dict);
+                                       OFONO_PROPERTIES_ARRAY_SIGNATURE,
+                                       &dict);
 
        voicecalls_path_list(modem, calls->call_list, &callobj_list);