diff --git a/include/dbus.h b/include/dbus.h index 2e78b5bd..8a1db424 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -32,6 +32,10 @@ extern "C" { DBusConnection *ofono_dbus_get_connection(); +int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path, + const char *interface, const char *name, + int type, void *value); + #ifdef __cplusplus } #endif diff --git a/src/call-barring.c b/src/call-barring.c index ec0ae222..dc752aed 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -120,7 +120,7 @@ static inline void emit_barring_changed(struct ofono_modem *modem, int start, snprintf(property_name, sizeof(property_name), "%s%s", bearer_class_to_string(cls), type); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_BARRING_INTERFACE, property_name, DBUS_TYPE_STRING, &value); diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 77008236..01cebb7a 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -258,7 +258,7 @@ static void set_new_cond_list(struct ofono_modem *modem, int type, GSList *list) if (oc->phone_number.type != lc->phone_number.type || strcmp(oc->phone_number.number, lc->phone_number.number)) - dbus_gsm_signal_property_changed(conn, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_FORWARDING_INTERFACE, attr, DBUS_TYPE_STRING, @@ -266,7 +266,7 @@ static void set_new_cond_list(struct ofono_modem *modem, int type, GSList *list) if (type == CALL_FORWARDING_TYPE_NO_REPLY && oc->time != lc->time) - dbus_gsm_signal_property_changed(conn, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_FORWARDING_INTERFACE, tattr, DBUS_TYPE_UINT16, @@ -278,14 +278,14 @@ static void set_new_cond_list(struct ofono_modem *modem, int type, GSList *list) } else { number = phone_number_to_string(&lc->phone_number); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_FORWARDING_INTERFACE, attr, DBUS_TYPE_STRING, &number); if (type == CALL_FORWARDING_TYPE_NO_REPLY && lc->time != DEFAULT_NO_REPLY_TIMEOUT) - dbus_gsm_signal_property_changed(conn, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_FORWARDING_INTERFACE, tattr, DBUS_TYPE_UINT16, @@ -305,13 +305,13 @@ static void set_new_cond_list(struct ofono_modem *modem, int type, GSList *list) if (type == CALL_FORWARDING_TYPE_NO_REPLY) sprintf(tattr, "%sTimeout", attr); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_FORWARDING_INTERFACE, attr, DBUS_TYPE_STRING, &number); if (type == CALL_FORWARDING_TYPE_NO_REPLY && oc->time != DEFAULT_NO_REPLY_TIMEOUT) - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_FORWARDING_INTERFACE, tattr, DBUS_TYPE_UINT16, &timeout); diff --git a/src/call-meter.c b/src/call-meter.c index 64f6489b..c751019e 100644 --- a/src/call-meter.c +++ b/src/call-meter.c @@ -81,7 +81,7 @@ static void set_call_meter(struct ofono_modem *modem, int value) cm->call_meter = value; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_METER_INTERFACE, "CallMeter", DBUS_TYPE_UINT32, @@ -98,7 +98,7 @@ static void set_acm(struct ofono_modem *modem, int value) cm->acm = value; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_METER_INTERFACE, "AccumulatedCallMeter", DBUS_TYPE_UINT32, @@ -115,7 +115,7 @@ static void set_acm_max(struct ofono_modem *modem, int value) cm->acm_max = value; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_METER_INTERFACE, "AccumulatedCallMeterMaximum", DBUS_TYPE_UINT32, @@ -132,7 +132,7 @@ static void set_ppu(struct ofono_modem *modem, double value) cm->ppu = value; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_METER_INTERFACE, "PricePerUnit", DBUS_TYPE_DOUBLE, @@ -156,7 +156,7 @@ static void set_currency(struct ofono_modem *modem, const char *value) strncpy(cm->currency, value, 3); cm->currency[3] = '\0'; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_METER_INTERFACE, "Currency", DBUS_TYPE_STRING, diff --git a/src/call-settings.c b/src/call-settings.c index 8e8d425a..dcf6a9df 100644 --- a/src/call-settings.c +++ b/src/call-settings.c @@ -145,7 +145,7 @@ static void set_clir_network(struct ofono_modem *modem, int clir) cs->clir = clir; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_SETTINGS_INTERFACE, "CallingLineRestriction", DBUS_TYPE_STRING, &str); @@ -162,7 +162,7 @@ static void set_clir_override(struct ofono_modem *modem, int override) cs->clir_setting = override; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_SETTINGS_INTERFACE, "HideCallerId", DBUS_TYPE_STRING, &str); } @@ -178,7 +178,7 @@ static void set_clip(struct ofono_modem *modem, int clip) cs->clip = clip; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_SETTINGS_INTERFACE, "CallingLinePresentation", DBUS_TYPE_STRING, &str); @@ -195,7 +195,7 @@ static void set_colp(struct ofono_modem *modem, int colp) cs->colp = colp; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_SETTINGS_INTERFACE, "CalledLinePresentation", DBUS_TYPE_STRING, &str); @@ -212,7 +212,7 @@ static void set_colr(struct ofono_modem *modem, int colr) cs->colr = colr; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_SETTINGS_INTERFACE, "CalledLineRestriction", DBUS_TYPE_STRING, &str); @@ -240,7 +240,7 @@ static void set_cw(struct ofono_modem *modem, int new_cw, int mask) value = "disabled"; sprintf(buf, "%sCallWaiting", bearer_class_to_string(j)); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, CALL_SETTINGS_INTERFACE, buf, DBUS_TYPE_STRING, &value); diff --git a/src/dbus-gsm.c b/src/dbus-gsm.c index b4de133e..260f6ec6 100644 --- a/src/dbus-gsm.c +++ b/src/dbus-gsm.c @@ -115,7 +115,7 @@ void dbus_gsm_dict_append_array(DBusMessageIter *dict, const char *key, dbus_message_iter_close_container(dict, &entry); } -int dbus_gsm_signal_property_changed(DBusConnection *conn, +int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path, const char *interface, const char *name, diff --git a/src/dbus-gsm.h b/src/dbus-gsm.h index c24b52cb..5c87b02b 100644 --- a/src/dbus-gsm.h +++ b/src/dbus-gsm.h @@ -41,10 +41,6 @@ void dbus_gsm_dict_append_array(DBusMessageIter *dict, const char *key, int type, void *val); -int dbus_gsm_signal_property_changed(DBusConnection *conn, const char *path, - const char *interface, const char *name, - int type, void *value); - int dbus_gsm_signal_array_property_changed(DBusConnection *conn, const char *path, const char *interface, diff --git a/src/network.c b/src/network.c index 77a80e0c..eebecf20 100644 --- a/src/network.c +++ b/src/network.c @@ -309,7 +309,7 @@ static void set_network_operator_status(struct ofono_modem *modem, status_str = network_operator_status_to_string(status); path = network_operator_build_path(modem, op); - dbus_gsm_signal_property_changed(conn, path, NETWORK_OPERATOR_INTERFACE, + ofono_dbus_signal_property_changed(conn, path, NETWORK_OPERATOR_INTERFACE, "Status", DBUS_TYPE_STRING, &status_str); } @@ -330,7 +330,7 @@ static void set_network_operator_technology(struct ofono_modem *modem, tech_str = registration_tech_to_string(tech); path = network_operator_build_path(modem, op); - dbus_gsm_signal_property_changed(conn, path, NETWORK_OPERATOR_INTERFACE, + ofono_dbus_signal_property_changed(conn, path, NETWORK_OPERATOR_INTERFACE, "Technology", DBUS_TYPE_STRING, &tech_str); } @@ -412,13 +412,13 @@ static void set_network_operator_name(struct ofono_modem *modem, path = network_operator_build_path(modem, op); - dbus_gsm_signal_property_changed(conn, path, NETWORK_OPERATOR_INTERFACE, + ofono_dbus_signal_property_changed(conn, path, NETWORK_OPERATOR_INTERFACE, "Name", DBUS_TYPE_STRING, &name); if (opd == netreg->current_operator) { operator = get_operator_display_name(modem); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "Operator", DBUS_TYPE_STRING, &operator); @@ -455,7 +455,7 @@ static void set_network_operator_eons_info(struct ofono_modem *modem, newname = opd->info->name; if (oldname != newname && strcmp(oldname, newname)) { - dbus_gsm_signal_property_changed(conn, path, + ofono_dbus_signal_property_changed(conn, path, NETWORK_OPERATOR_INTERFACE, "Name", DBUS_TYPE_STRING, &newname); @@ -463,7 +463,7 @@ static void set_network_operator_eons_info(struct ofono_modem *modem, if (opd == netreg->current_operator) { const char *operator = get_operator_display_name(modem); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "Operator", DBUS_TYPE_STRING, &operator); @@ -481,7 +481,7 @@ static void set_network_operator_eons_info(struct ofono_modem *modem, newinfo = ""; if (oldname != newname && strcmp(oldname, newname)) - dbus_gsm_signal_property_changed(conn, path, + ofono_dbus_signal_property_changed(conn, path, NETWORK_OPERATOR_INTERFACE, "AdditionalInformation", DBUS_TYPE_STRING, &newinfo); @@ -843,7 +843,7 @@ static void set_registration_status(struct ofono_modem *modem, int status) netreg->status = status; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "Status", DBUS_TYPE_STRING, &str_status); @@ -863,7 +863,7 @@ static void set_registration_location(struct ofono_modem *modem, int lac) if (netreg->location == -1) return; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "LocationAreaCode", DBUS_TYPE_UINT16, &dbus_lac); @@ -880,7 +880,7 @@ static void set_registration_cellid(struct ofono_modem *modem, int ci) if (netreg->cellid == -1) return; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "CellId", DBUS_TYPE_UINT32, &dbus_ci); @@ -897,7 +897,7 @@ static void set_registration_technology(struct ofono_modem *modem, int tech) if (netreg->technology == -1) return; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "Technology", DBUS_TYPE_STRING, &tech_str); @@ -1106,7 +1106,7 @@ static void current_operator_callback(const struct ofono_error *error, emit: operator = get_operator_display_name(modem); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "Operator", DBUS_TYPE_STRING, &operator); @@ -1176,7 +1176,7 @@ void ofono_signal_strength_notify(struct ofono_modem *modem, int strength) if (strength != -1) { dbus_uint16_t strength = netreg->signal_strength; - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "Strength", DBUS_TYPE_UINT16, &strength); @@ -1298,7 +1298,7 @@ static void sim_spdi_read_cb(struct ofono_modem *modem, int ok, operator = get_operator_display_name(modem); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "Operator", DBUS_TYPE_STRING, &operator); @@ -1365,7 +1365,7 @@ static void sim_spn_read_cb(struct ofono_modem *modem, int ok, operator = get_operator_display_name(modem); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "Operator", DBUS_TYPE_STRING, &operator); diff --git a/src/sms.c b/src/sms.c index 9cb7a404..ef15febf 100644 --- a/src/sms.c +++ b/src/sms.c @@ -116,7 +116,7 @@ static void set_sca(struct ofono_modem *modem, value = phone_number_to_string(&sms->sca); - dbus_gsm_signal_property_changed(conn, modem->path, + ofono_dbus_signal_property_changed(conn, modem->path, SMS_MANAGER_INTERFACE, "ServiceCenterAddress", DBUS_TYPE_STRING, &value); diff --git a/src/voicecall.c b/src/voicecall.c index 6ebd61d5..7c9e9d31 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -376,7 +376,7 @@ static void voicecall_set_call_status(struct ofono_modem *modem, status_str = call_status_to_string(status); path = voicecall_build_path(modem, call->call); - dbus_gsm_signal_property_changed(conn, path, VOICECALL_INTERFACE, + ofono_dbus_signal_property_changed(conn, path, VOICECALL_INTERFACE, "State", DBUS_TYPE_STRING, &status_str); @@ -390,7 +390,7 @@ static void voicecall_set_call_status(struct ofono_modem *modem, call->start_time = time(NULL); timestr = time_to_str(&call->start_time); - dbus_gsm_signal_property_changed(conn, path, + ofono_dbus_signal_property_changed(conn, path, VOICECALL_INTERFACE, "StartTime", DBUS_TYPE_STRING, @@ -434,7 +434,7 @@ static void voicecall_set_call_lineid(struct ofono_modem *modem, else lineid_str = phone_number_to_string(ph); - dbus_gsm_signal_property_changed(conn, path, VOICECALL_INTERFACE, + ofono_dbus_signal_property_changed(conn, path, VOICECALL_INTERFACE, "LineIdentification", DBUS_TYPE_STRING, &lineid_str); }