diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-10-11 11:24:41 -0700 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-10-11 11:24:41 -0700 |
| commit | 19b7c8fef19747ece136681237eb48833076f8e2 (patch) | |
| tree | 20dca0b8e049b3897be1ee8cbbcd17957d6184b4 /src | |
| parent | 665d1847a8917a94b4260f211e391fc67b62e53a (diff) | |
cdma: use consistent terminology for registration
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-generic-cdma.c | 12 | ||||
| -rw-r--r-- | src/mm-generic-cdma.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c index 2b33e743..89f09ffa 100644 --- a/src/mm-generic-cdma.c +++ b/src/mm-generic-cdma.c @@ -820,7 +820,7 @@ reg_state_css_response (MMModemCdma *cdma, MMModem *modem = info->modem; /* We'll get an error if the SID isn't valid, so detect that and - * report unknown registration status. + * report unknown registration state. */ if (error) { if ( (error->domain == MM_MOBILE_ERROR) @@ -839,10 +839,10 @@ reg_state_css_response (MMModemCdma *cdma, } /* SID is valid; let subclasses figure out roaming and detailed registration */ - if (MM_GENERIC_CDMA_GET_CLASS (modem)->query_registration_status) { - MM_GENERIC_CDMA_GET_CLASS (modem)->query_registration_status (MM_GENERIC_CDMA (modem), - reg_state_query_done, - info); + if (MM_GENERIC_CDMA_GET_CLASS (modem)->query_registration_state) { + MM_GENERIC_CDMA_GET_CLASS (modem)->query_registration_state (MM_GENERIC_CDMA (modem), + reg_state_query_done, + info); } else { reg_state_query_done (modem, MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED, @@ -914,7 +914,7 @@ get_registration_state (MMModemCdma *modem, } info = mm_callback_info_uint_new (MM_MODEM (modem), callback, user_data); - /* Prefer secondary port for registration status */ + /* Prefer secondary port for registration state */ mm_serial_port_queue_command (priv->secondary ? priv->secondary : priv->primary, "+CAD?", 3, diff --git a/src/mm-generic-cdma.h b/src/mm-generic-cdma.h index dbf1f0d7..cc19949e 100644 --- a/src/mm-generic-cdma.h +++ b/src/mm-generic-cdma.h @@ -36,9 +36,9 @@ typedef struct { typedef struct { MMModemBaseClass parent; - void (*query_registration_status) (MMGenericCdma *self, - MMModemUIntFn callback, - gpointer user_data); + void (*query_registration_state) (MMGenericCdma *self, + MMModemUIntFn callback, + gpointer user_data); } MMGenericCdmaClass; GType mm_generic_cdma_get_type (void); |