diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-07-28 19:11:32 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-07-29 12:26:05 -0500 |
| commit | 00fb6cce6285d02b32ae17d02e984c511a810c14 (patch) | |
| tree | 22e59c75a22ad6a3330207f183d7726188ce8d68 /drivers | |
| parent | 5cd850304c60ce1011f8a53c9efdab0fca02dbc4 (diff) | |
| download | ofono-00fb6cce6285d02b32ae17d02e984c511a810c14.tar.bz2 | |
Rename dbus_gsm error functions to __ofono_error
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/atmodem/atmodem.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c index 41e63b4a..4e3e5544 100644 --- a/drivers/atmodem/atmodem.c +++ b/drivers/atmodem/atmodem.c @@ -42,6 +42,11 @@ static GSList *g_sessions = NULL; static GSList *g_pending = NULL; +DBusMessage *__ofono_error_invalid_args(DBusMessage *msg); +DBusMessage *__ofono_error_invalid_format(DBusMessage *msg); +DBusMessage *__ofono_error_failed(DBusMessage *msg); +DBusMessage *__ofono_error_not_found(DBusMessage *msg); + static void modem_list(char ***modems) { GSList *l; @@ -388,7 +393,7 @@ out: if (at) at_destroy(at); - reply = dbus_gsm_failed(msg); + reply = __ofono_error_failed(msg); g_dbus_send_message(conn, reply); } @@ -403,12 +408,12 @@ static DBusMessage *manager_create(DBusConnection *conn, DBusMessage *msg, DBUS_TYPE_STRING, &target, DBUS_TYPE_STRING, &driver, DBUS_TYPE_INVALID)) - return dbus_gsm_invalid_args(msg); + return __ofono_error_invalid_args(msg); io = modem_session_create(target, create_cb, msg, msg_destroy); if (!io) - return dbus_gsm_invalid_format(msg); + return __ofono_error_invalid_format(msg); dbus_message_ref(msg); @@ -426,7 +431,7 @@ static DBusMessage *manager_destroy(DBusConnection *conn, DBusMessage *msg, if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) - return dbus_gsm_invalid_args(msg); + return __ofono_error_invalid_args(msg); for (l = g_sessions; l; l = l->next) { struct at_data *at = l->data; @@ -451,7 +456,7 @@ static DBusMessage *manager_destroy(DBusConnection *conn, DBusMessage *msg, return dbus_message_new_method_return(msg); } - return dbus_gsm_not_found(msg); + return __ofono_error_not_found(msg); } static DBusMessage *manager_get_properties(DBusConnection *conn, |