sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Move sms interface definition to dbus.h

This commit is contained in:
Denis Kenzior 2010-03-22 15:28:08 -05:00
parent e1e036b5df
commit 5ab70ab5f2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dbus.h
View File

@ -36,6 +36,7 @@ extern "C" {
#define OFONO_CALL_FORWARDING_INTERFACE "org.ofono.CallForwarding" #define OFONO_CALL_FORWARDING_INTERFACE "org.ofono.CallForwarding"
#define OFONO_CALL_METER_INTERFACE "org.ofono.CallMeter" #define OFONO_CALL_METER_INTERFACE "org.ofono.CallMeter"
#define OFONO_PHONEBOOK_INTERFACE "org.ofono.Phonebook" #define OFONO_PHONEBOOK_INTERFACE "org.ofono.Phonebook"
#define OFONO_SMS_MANAGER_INTERFACE "org.ofono.SmsManager"
#define OFONO_CALL_SETTINGS_INTERFACE "org.ofono.CallSettings" #define OFONO_CALL_SETTINGS_INTERFACE "org.ofono.CallSettings"
#define OFONO_VOICECALL_INTERFACE "org.ofono.VoiceCall" #define OFONO_VOICECALL_INTERFACE "org.ofono.VoiceCall"
#define OFONO_VOICECALL_MANAGER_INTERFACE "org.ofono.VoiceCallManager" #define OFONO_VOICECALL_MANAGER_INTERFACE "org.ofono.VoiceCallManager"

16
src/sms.c
View File

@ -39,8 +39,6 @@
#define uninitialized_var(x) x = x #define uninitialized_var(x) x = x
#define SMS_MANAGER_INTERFACE "org.ofono.SmsManager"
#define SMS_MANAGER_FLAG_CACHED 0x1 #define SMS_MANAGER_FLAG_CACHED 0x1
#define SETTINGS_STORE "sms" #define SETTINGS_STORE "sms"
@ -105,7 +103,7 @@ static void set_sca(struct ofono_sms *sms,
value = phone_number_to_string(&sms->sca); value = phone_number_to_string(&sms->sca);
ofono_dbus_signal_property_changed(conn, path, ofono_dbus_signal_property_changed(conn, path,
SMS_MANAGER_INTERFACE, OFONO_SMS_MANAGER_INTERFACE,
"ServiceCenterAddress", "ServiceCenterAddress",
DBUS_TYPE_STRING, &value); DBUS_TYPE_STRING, &value);
} }
@ -506,7 +504,7 @@ static void dispatch_text_message(struct ofono_sms *sms,
else else
signal_name = "IncomingMessage"; signal_name = "IncomingMessage";
signal = dbus_message_new_signal(path, SMS_MANAGER_INTERFACE, signal = dbus_message_new_signal(path, OFONO_SMS_MANAGER_INTERFACE,
signal_name); signal_name);
if (!signal) if (!signal)
@ -845,8 +843,8 @@ static void sms_unregister(struct ofono_atom *atom)
struct ofono_modem *modem = __ofono_atom_get_modem(atom); struct ofono_modem *modem = __ofono_atom_get_modem(atom);
const char *path = __ofono_atom_get_path(atom); const char *path = __ofono_atom_get_path(atom);
g_dbus_unregister_interface(conn, path, SMS_MANAGER_INTERFACE); g_dbus_unregister_interface(conn, path, OFONO_SMS_MANAGER_INTERFACE);
ofono_modem_remove_interface(modem, SMS_MANAGER_INTERFACE); ofono_modem_remove_interface(modem, OFONO_SMS_MANAGER_INTERFACE);
if (sms->mw_watch) { if (sms->mw_watch) {
__ofono_modem_remove_atom_watch(modem, sms->mw_watch); __ofono_modem_remove_atom_watch(modem, sms->mw_watch);
@ -978,16 +976,16 @@ void ofono_sms_register(struct ofono_sms *sms)
struct ofono_atom *sim_atom; struct ofono_atom *sim_atom;
if (!g_dbus_register_interface(conn, path, if (!g_dbus_register_interface(conn, path,
SMS_MANAGER_INTERFACE, OFONO_SMS_MANAGER_INTERFACE,
sms_manager_methods, sms_manager_methods,
sms_manager_signals, sms_manager_signals,
NULL, sms, NULL)) { NULL, sms, NULL)) {
ofono_error("Could not create %s interface", ofono_error("Could not create %s interface",
SMS_MANAGER_INTERFACE); OFONO_SMS_MANAGER_INTERFACE);
return; return;
} }
ofono_modem_add_interface(modem, SMS_MANAGER_INTERFACE); ofono_modem_add_interface(modem, OFONO_SMS_MANAGER_INTERFACE);
sms->mw_watch = __ofono_modem_add_atom_watch(modem, sms->mw_watch = __ofono_modem_add_atom_watch(modem,
OFONO_ATOM_TYPE_MESSAGE_WAITING, OFONO_ATOM_TYPE_MESSAGE_WAITING,