colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make pending_registration_stop() accessible to inherited implementations.

Browse Source
This commit is contained in:
Tambet Ingo
2009-05-14 13:14:45 +03:00
parent 92041d5f75
commit ddbeb41829
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mm-generic-gsm.c
View File

@@ -32,7 +32,6 @@ typedef struct {
guint32 cid; guint32 cid;
} MMGenericGsmPrivate; } MMGenericGsmPrivate;
static void pending_registration_stop (MMGenericGsm *self);
static void get_registration_status (MMSerial *serial, MMCallbackInfo *info); static void get_registration_status (MMSerial *serial, MMCallbackInfo *info);
static void read_operator_done (MMSerial *serial, static void read_operator_done (MMSerial *serial,
GString *response, GString *response,
@@ -232,7 +231,7 @@ enable (MMModem *modem,
info = mm_callback_info_new (modem, callback, user_data); info = mm_callback_info_new (modem, callback, user_data);
if (!do_enable) { if (!do_enable) {
pending_registration_stop (MM_GENERIC_GSM (modem)); mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
if (mm_serial_is_connected (MM_SERIAL (modem))) if (mm_serial_is_connected (MM_SERIAL (modem)))
mm_serial_flash (MM_SERIAL (modem), 1000, disable_flash_done, info); mm_serial_flash (MM_SERIAL (modem), 1000, disable_flash_done, info);
@@ -539,10 +538,10 @@ pending_registration_timed_out (gpointer data)
return FALSE; return FALSE;
} }
static void void
pending_registration_stop (MMGenericGsm *self) mm_generic_gsm_pending_registration_stop (MMGenericGsm *modem)
{ {
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (self); MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
if (priv->pending_registration) { if (priv->pending_registration) {
g_source_remove (priv->pending_registration); g_source_remove (priv->pending_registration);
@@ -615,7 +614,7 @@ reg_status_updated (MMGenericGsm *self, int new_value)
status == MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING || status == MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING ||
status == MM_MODEM_GSM_NETWORK_REG_STATUS_DENIED) status == MM_MODEM_GSM_NETWORK_REG_STATUS_DENIED)
pending_registration_stop (self); mm_generic_gsm_pending_registration_stop (self);
} }
static void static void
@@ -1555,7 +1554,7 @@ finalize (GObject *object)
{ {
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (object); MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (object);
pending_registration_stop (MM_GENERIC_GSM (object)); mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (object));
g_free (priv->driver); g_free (priv->driver);
g_free (priv->data_device); g_free (priv->data_device);

2
src/mm-generic-gsm.h
View File

@@ -29,6 +29,8 @@ MMModem *mm_generic_gsm_new (const char *serial_device,
void mm_generic_gsm_set_unsolicited_registration (MMGenericGsm *modem, void mm_generic_gsm_set_unsolicited_registration (MMGenericGsm *modem,
gboolean enabled); gboolean enabled);
void mm_generic_gsm_pending_registration_stop (MMGenericGsm *modem);
void mm_generic_gsm_set_cid (MMGenericGsm *modem, void mm_generic_gsm_set_cid (MMGenericGsm *modem,
guint32 cid); guint32 cid);