diff options
author | Dan Williams <dcbw@redhat.com> | 2010-03-10 14:42:34 -0800 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2010-03-10 14:42:34 -0800 |
commit | 461de7ea0eeab4dfa5827dcce490eded3d729f6e (patch) | |
tree | ac1aa3fc92b5afc5dab556ac616a8b73423fb0b1 /plugins/mm-modem-mbm.c | |
parent | 59b75b5194c6f2a649ca2a4bd6747f74b220d773 (diff) |
mbm: use new disconnect handling helper
Diffstat (limited to 'plugins/mm-modem-mbm.c')
-rw-r--r-- | plugins/mm-modem-mbm.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c index 43302e9b..7070f728 100644 --- a/plugins/mm-modem-mbm.c +++ b/plugins/mm-modem-mbm.c @@ -494,23 +494,18 @@ do_connect (MMModem *modem, } static void -disconnect (MMModem *modem, - MMModemFn callback, - gpointer user_data) +do_disconnect (MMGenericGsm *gsm, + gint cid, + MMModemFn callback, + gpointer user_data) { - MMCallbackInfo *info; MMSerialPort *primary; - mm_modem_set_state (modem, MM_MODEM_STATE_DISCONNECTING, MM_MODEM_STATE_REASON_NONE); - - primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY); + primary = mm_generic_gsm_get_port (gsm, MM_PORT_TYPE_PRIMARY); g_assert (primary); mm_serial_port_queue_command (primary, "*ENAP=0", 3, NULL, NULL); - mm_generic_gsm_update_enabled_state (MM_GENERIC_GSM (modem), FALSE, MM_MODEM_STATE_REASON_NONE); - - info = mm_callback_info_new (modem, callback, user_data); - mm_callback_info_schedule (info); + MM_GENERIC_GSM_CLASS (mm_modem_mbm_parent_class)->do_disconnect (gsm, cid, callback, user_data); } /*****************************************************************************/ @@ -837,7 +832,6 @@ modem_init (MMModem *modem_class) modem_class->grab_port = grab_port; modem_class->disable = disable; modem_class->connect = do_connect; - modem_class->disconnect = disconnect; } static void @@ -871,6 +865,7 @@ mm_modem_mbm_class_init (MMModemMbmClass *klass) object_class->finalize = finalize; gsm_class->do_enable = do_enable; + gsm_class->do_disconnect = do_disconnect; gsm_class->get_allowed_mode = get_allowed_mode; gsm_class->set_allowed_mode = set_allowed_mode; } |