diff options
Diffstat (limited to 'src/modem-manager/nm-modem-cdma.c')
| -rw-r--r-- | src/modem-manager/nm-modem-cdma.c | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/src/modem-manager/nm-modem-cdma.c b/src/modem-manager/nm-modem-cdma.c index fa19a342..73c87c28 100644 --- a/src/modem-manager/nm-modem-cdma.c +++ b/src/modem-manager/nm-modem-cdma.c @@ -37,7 +37,7 @@ #include "NetworkManagerUtils.h" #include "nm-logging.h" -G_DEFINE_TYPE (NMModemCdma, nm_modem_cdma, NM_TYPE_MODEM) +G_DEFINE_TYPE (NMModemCdma, nm_modem_cdma, NM_TYPE_MODEM_GENERIC) #define NM_MODEM_CDMA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MODEM_CDMA, NMModemCdmaPrivate)) @@ -62,19 +62,20 @@ nm_cdma_error_quark (void) NMModem * nm_modem_cdma_new (const char *path, - const char *device, const char *data_device, - guint32 ip_method) + guint32 ip_method, + NMModemState state) { g_return_val_if_fail (path != NULL, NULL); - g_return_val_if_fail (device != NULL, NULL); g_return_val_if_fail (data_device != NULL, NULL); return (NMModem *) g_object_new (NM_TYPE_MODEM_CDMA, NM_MODEM_PATH, path, - NM_MODEM_DEVICE, device, - NM_MODEM_IFACE, data_device, + NM_MODEM_UID, data_device, + NM_MODEM_CONTROL_PORT, NULL, + NM_MODEM_DATA_PORT, data_device, NM_MODEM_IP_METHOD, ip_method, + NM_MODEM_CONNECTED, (state == NM_MODEM_STATE_CONNECTED), NULL); } @@ -109,7 +110,7 @@ do_connect (NMModemCdma *self) NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (self); DBusGProxy *proxy; - proxy = nm_modem_get_proxy (NM_MODEM (self), MM_DBUS_INTERFACE_MODEM_SIMPLE); + proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (self), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE); priv->call = dbus_g_proxy_begin_call_with_timeout (proxy, "Connect", stage1_prepare_done, self, NULL, 120000, @@ -152,11 +153,11 @@ create_connect_properties (NMConnection *connection) } static NMActStageReturn -real_act_stage1_prepare (NMModem *modem, - NMActRequest *req, - GPtrArray **out_hints, - const char **out_setting_name, - NMDeviceStateReason *reason) +act_stage1_prepare (NMModem *modem, + NMActRequest *req, + GPtrArray **out_hints, + const char **out_setting_name, + NMDeviceStateReason *reason) { NMModemCdma *self = NM_MODEM_CDMA (modem); NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (self); @@ -177,7 +178,7 @@ real_act_stage1_prepare (NMModem *modem, if (enabled) do_connect (self); else { - proxy = nm_modem_get_proxy (modem, MM_DBUS_INTERFACE_MODEM); + proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (modem), MM_OLD_DBUS_INTERFACE_MODEM); dbus_g_proxy_begin_call_with_timeout (proxy, "Enable", stage1_enable_done, modem, NULL, 20000, @@ -192,9 +193,9 @@ real_act_stage1_prepare (NMModem *modem, } static NMConnection * -real_get_best_auto_connection (NMModem *modem, - GSList *connections, - char **specific_object) +get_best_auto_connection (NMModem *modem, + GSList *connections, + char **specific_object) { GSList *iter; @@ -217,9 +218,9 @@ real_get_best_auto_connection (NMModem *modem, } static gboolean -real_check_connection_compatible (NMModem *modem, - NMConnection *connection, - GError **error) +check_connection_compatible (NMModem *modem, + NMConnection *connection, + GError **error) { NMSettingConnection *s_con; NMSettingCdma *s_cdma; @@ -246,10 +247,10 @@ real_check_connection_compatible (NMModem *modem, } static gboolean -real_complete_connection (NMModem *modem, - NMConnection *connection, - const GSList *existing_connections, - GError **error) +complete_connection (NMModem *modem, + NMConnection *connection, + const GSList *existing_connections, + GError **error) { NMSettingCdma *s_cdma; NMSettingPPP *s_ppp; @@ -284,10 +285,10 @@ real_complete_connection (NMModem *modem, } static gboolean -real_get_user_pass (NMModem *modem, - NMConnection *connection, - const char **user, - const char **pass) +get_user_pass (NMModem *modem, + NMConnection *connection, + const char **user, + const char **pass) { NMSettingCdma *s_cdma; @@ -304,25 +305,25 @@ real_get_user_pass (NMModem *modem, } static const char * -real_get_setting_name (NMModem *modem) +get_setting_name (NMModem *modem) { return NM_SETTING_CDMA_SETTING_NAME; } static void -real_deactivate (NMModem *modem, NMDevice *device) +deactivate (NMModem *modem, NMDevice *device) { NMModemCdmaPrivate *priv = NM_MODEM_CDMA_GET_PRIVATE (modem); if (priv->call) { DBusGProxy *proxy; - proxy = nm_modem_get_proxy (modem, MM_DBUS_INTERFACE_MODEM_SIMPLE); + proxy = nm_modem_generic_get_proxy (NM_MODEM_GENERIC (modem), MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE); dbus_g_proxy_cancel_call (proxy, priv->call); priv->call = NULL; } - NM_MODEM_CLASS (nm_modem_cdma_parent_class)->deactivate (modem, device); + NM_MODEM_CLASS (nm_modem_cdma_parent_class)->deactivate (modem, device); } /*****************************************************************************/ @@ -354,13 +355,13 @@ nm_modem_cdma_class_init (NMModemCdmaClass *klass) /* Virtual methods */ object_class->dispose = dispose; - modem_class->get_user_pass = real_get_user_pass; - modem_class->get_setting_name = real_get_setting_name; - modem_class->get_best_auto_connection = real_get_best_auto_connection; - modem_class->check_connection_compatible = real_check_connection_compatible; - modem_class->complete_connection = real_complete_connection; - modem_class->act_stage1_prepare = real_act_stage1_prepare; - modem_class->deactivate = real_deactivate; + modem_class->get_user_pass = get_user_pass; + modem_class->get_setting_name = get_setting_name; + modem_class->get_best_auto_connection = get_best_auto_connection; + modem_class->check_connection_compatible = check_connection_compatible; + modem_class->complete_connection = complete_connection; + modem_class->act_stage1_prepare = act_stage1_prepare; + modem_class->deactivate = deactivate; dbus_g_error_domain_register (NM_CDMA_ERROR, NULL, NM_TYPE_CDMA_ERROR); } |