[network-manager-netbook] Automatically create a connection for GSM connections
- From: Tambet Ingo <tambeti src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-netbook] Automatically create a connection for GSM connections
- Date: Tue, 2 Mar 2010 20:34:30 +0000 (UTC)
commit 4d82d11b2a36971d4892ba8f1ebe30b2d1419401
Author: Tambet Ingo <tambet gmail com>
Date: Tue Mar 2 14:46:04 2010 -0400
Automatically create a connection for GSM connections
If there's no configured connections for a GSM card, open it, read it's
IMSI, and try to find a matching entry from mobile providers database.
Add the matching item if found.
libnm-gtk/Makefile.am | 2 +
libnm-gtk/libnm-gtk-gsm-device.c | 309 ++++++++++++++++++++++++++++++++++++++
libnm-gtk/libnm-gtk-gsm-device.h | 70 +++++++++
libnm-gtk/nm-gsm-provider.c | 231 ++++++++++++++++++++++++++++
4 files changed, 612 insertions(+), 0 deletions(-)
---
diff --git a/libnm-gtk/Makefile.am b/libnm-gtk/Makefile.am
index b4b1ff5..7bfc5a8 100644
--- a/libnm-gtk/Makefile.am
+++ b/libnm-gtk/Makefile.am
@@ -53,6 +53,8 @@ libnm_gtk_la_SOURCES = \
gconf-helpers.h \
gconf-upgrade.c \
gconf-upgrade.h \
+ libnm-gtk-gsm-device.c \
+ libnm-gtk-gsm-device.h \
nm-bt-item.c \
nm-bt-provider.c \
nm-cdma-item.c \
diff --git a/libnm-gtk/libnm-gtk-gsm-device.c b/libnm-gtk/libnm-gtk-gsm-device.c
new file mode 100644
index 0000000..cd050c2
--- /dev/null
+++ b/libnm-gtk/libnm-gtk-gsm-device.c
@@ -0,0 +1,309 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+#include "libnm-gtk-gsm-device.h"
+
+#define MM_DBUS_SERVICE "org.freedesktop.ModemManager"
+#define MM_DBUS_INTERFACE_MODEM "org.freedesktop.ModemManager.Modem"
+#define MM_DBUS_INTERFACE_MODEM_GSM_CARD "org.freedesktop.ModemManager.Modem.Gsm.Card"
+
+typedef struct {
+ DBusGProxy *modem_proxy;
+ DBusGProxy *card_proxy;
+} NMGsmDevicePrivate;
+
+static void
+destroy_priv (gpointer data)
+{
+ NMGsmDevicePrivate *priv = data;
+
+ g_object_unref (priv->modem_proxy);
+ g_object_unref (priv->card_proxy);
+ g_slice_free (NMGsmDevicePrivate, data);
+}
+
+static NMGsmDevicePrivate *
+get_private (NMGsmDevice *device)
+{
+ NMGsmDevicePrivate *priv;
+
+ priv = g_object_get_data (G_OBJECT (device), "libnm-gtk-gsm-device-private");
+ if (!priv) {
+ priv = g_slice_new (NMGsmDevicePrivate);
+
+ priv->modem_proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (NM_OBJECT (device)),
+ MM_DBUS_SERVICE,
+ nm_device_get_udi (NM_DEVICE (device)),
+ MM_DBUS_INTERFACE_MODEM);
+
+ priv->card_proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (NM_OBJECT (device)),
+ MM_DBUS_SERVICE,
+ nm_device_get_udi (NM_DEVICE (device)),
+ MM_DBUS_INTERFACE_MODEM_GSM_CARD);
+
+ g_object_set_data_full (G_OBJECT (device), "libnm-gtk-gsm-device-private", priv, destroy_priv);
+ }
+
+ return priv;
+}
+
+#define GET_PRIVATE(o) get_private(o);
+
+static void
+modem_enable_cb (DBusGProxy *proxy,
+ DBusGProxyCall *call_id,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *result = user_data;
+ GError *error = NULL;
+
+ if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
+ g_simple_async_result_set_from_error (result, error);
+ g_error_free (error);
+ }
+
+ g_simple_async_result_complete (result);
+}
+
+void
+nm_gsm_device_enable (NMGsmDevice *device,
+ gboolean enabled,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ NMGsmDevicePrivate *priv;
+ GSimpleAsyncResult *result;
+
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+
+ result = g_simple_async_result_new (G_OBJECT (device), callback, user_data, nm_gsm_device_enable_finish);
+
+ priv = GET_PRIVATE (device);
+ dbus_g_proxy_begin_call (priv->modem_proxy,
+ "Enable", modem_enable_cb,
+ result, g_object_unref,
+ G_TYPE_BOOLEAN, enabled,
+ G_TYPE_INVALID);
+}
+
+gboolean
+nm_gsm_device_enable_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error)
+{
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+
+ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error) ||
+ !g_simple_async_result_is_valid (result, G_OBJECT (device), nm_gsm_device_enable_finish))
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+modem_send_pin_cb (DBusGProxy *proxy,
+ DBusGProxyCall *call_id,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *result = user_data;
+ GError *error = NULL;
+
+ if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
+ g_simple_async_result_set_from_error (result, error);
+ g_error_free (error);
+ }
+
+ g_simple_async_result_complete (result);
+}
+
+void
+nm_gsm_device_send_pin (NMGsmDevice *device,
+ const char *pin,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ NMGsmDevicePrivate *priv;
+ GSimpleAsyncResult *result;
+
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+ g_return_if_fail (pin != NULL);
+
+ result = g_simple_async_result_new (G_OBJECT (device), callback, user_data, nm_gsm_device_send_pin_finish);
+
+ priv = GET_PRIVATE (device);
+ dbus_g_proxy_begin_call (priv->card_proxy,
+ "SendPin", modem_send_pin_cb,
+ result, g_object_unref,
+ G_TYPE_STRING, pin,
+ G_TYPE_INVALID);
+}
+
+gboolean
+nm_gsm_device_send_pin_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error)
+{
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+
+ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error) ||
+ !g_simple_async_result_is_valid (result, G_OBJECT (device), nm_gsm_device_send_pin_finish))
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+modem_enable_pin_cb (DBusGProxy *proxy,
+ DBusGProxyCall *call_id,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *result = user_data;
+ GError *error = NULL;
+
+ if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
+ g_simple_async_result_set_from_error (result, error);
+ g_error_free (error);
+ }
+
+ g_simple_async_result_complete (result);
+}
+
+void
+nm_gsm_device_enable_pin (NMGsmDevice *device,
+ const char *pin,
+ gboolean enabled,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ NMGsmDevicePrivate *priv;
+ GSimpleAsyncResult *result;
+
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+ g_return_if_fail (pin != NULL);
+
+ result = g_simple_async_result_new (G_OBJECT (device), callback, user_data, nm_gsm_device_enable_pin_finish);
+
+ priv = GET_PRIVATE (device);
+ dbus_g_proxy_begin_call (priv->card_proxy,
+ "EnablePin", modem_enable_pin_cb,
+ result, g_object_unref,
+ G_TYPE_STRING, pin,
+ G_TYPE_BOOLEAN, enabled,
+ G_TYPE_INVALID);
+}
+
+gboolean
+nm_gsm_device_enable_pin_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error)
+{
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+
+ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error) ||
+ !g_simple_async_result_is_valid (result, G_OBJECT (device), nm_gsm_device_enable_pin_finish))
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+modem_get_imei_cb (DBusGProxy *proxy,
+ DBusGProxyCall *call_id,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *result = user_data;
+ char *str = NULL;
+ GError *error = NULL;
+
+ if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_STRING, &str, G_TYPE_INVALID)) {
+ g_simple_async_result_set_from_error (result, error);
+ g_error_free (error);
+ } else
+ g_simple_async_result_set_op_res_gpointer (result, str, g_free);
+
+ g_simple_async_result_complete (result);
+}
+
+void
+nm_gsm_device_get_imei (NMGsmDevice *device,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ NMGsmDevicePrivate *priv;
+ GSimpleAsyncResult *result;
+
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+
+ result = g_simple_async_result_new (G_OBJECT (device), callback, user_data, nm_gsm_device_get_imei_finish);
+
+ priv = GET_PRIVATE (device);
+ dbus_g_proxy_begin_call (priv->card_proxy,
+ "GetImei", modem_get_imei_cb,
+ result, g_object_unref,
+ G_TYPE_INVALID);
+}
+
+char *
+nm_gsm_device_get_imei_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error)
+{
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+
+ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error) ||
+ !g_simple_async_result_is_valid (result, G_OBJECT (device), nm_gsm_device_get_imei_finish))
+ return NULL;
+
+ return g_strdup (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)));
+}
+
+static void
+modem_get_imsi_cb (DBusGProxy *proxy,
+ DBusGProxyCall *call_id,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *result = user_data;
+ char *str = NULL;
+ GError *error = NULL;
+
+ if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_STRING, &str, G_TYPE_INVALID)) {
+ g_simple_async_result_set_from_error (result, error);
+ g_error_free (error);
+ } else
+ g_simple_async_result_set_op_res_gpointer (result, str, g_free);
+
+ g_simple_async_result_complete (result);
+}
+
+void
+nm_gsm_device_get_imsi (NMGsmDevice *device,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ NMGsmDevicePrivate *priv;
+ GSimpleAsyncResult *result;
+
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+
+ result = g_simple_async_result_new (G_OBJECT (device), callback, user_data, nm_gsm_device_get_imsi_finish);
+
+ priv = GET_PRIVATE (device);
+ dbus_g_proxy_begin_call (priv->card_proxy,
+ "GetImsi", modem_get_imsi_cb,
+ result, g_object_unref,
+ G_TYPE_INVALID);
+}
+
+char *
+nm_gsm_device_get_imsi_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error)
+{
+ g_return_if_fail (NM_IS_GSM_DEVICE (device));
+
+ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error) ||
+ !g_simple_async_result_is_valid (result, G_OBJECT (device), nm_gsm_device_get_imsi_finish))
+ return NULL;
+
+ return g_strdup (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)));
+}
+
diff --git a/libnm-gtk/libnm-gtk-gsm-device.h b/libnm-gtk/libnm-gtk-gsm-device.h
new file mode 100644
index 0000000..ba47243
--- /dev/null
+++ b/libnm-gtk/libnm-gtk-gsm-device.h
@@ -0,0 +1,70 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2010 Novell, Inc.
+ */
+
+#ifndef LIBNM_GTK_GSM_DEVICE_H
+#define LIBNM_GTK_GSM_DEVICE_H
+
+#include <gio/gio.h>
+#include <nm-gsm-device.h>
+
+void nm_gsm_device_enable (NMGsmDevice *device,
+ gboolean enabled,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean nm_gsm_device_enable_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error);
+
+void nm_gsm_device_send_pin (NMGsmDevice *device,
+ const char *pin,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean nm_gsm_device_send_pin_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error);
+
+void nm_gsm_device_enable_pin (NMGsmDevice *device,
+ const char *pin,
+ gboolean enabled,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean nm_gsm_device_enable_pin_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error);
+
+void nm_gsm_device_get_imei (NMGsmDevice *device,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+char *nm_gsm_device_get_imei_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error);
+
+void nm_gsm_device_get_imsi (NMGsmDevice *device,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+char *nm_gsm_device_get_imsi_finish (NMGsmDevice *device,
+ GAsyncResult *result,
+ GError **error);
+
+#endif /* LIBNM_GTK_GSM_DEVICE_H */
diff --git a/libnm-gtk/nm-gsm-provider.c b/libnm-gtk/nm-gsm-provider.c
index 859c488..d78cc1a 100644
--- a/libnm-gtk/nm-gsm-provider.c
+++ b/libnm-gtk/nm-gsm-provider.c
@@ -17,12 +17,32 @@
* (C) Copyright 2009 Novell, Inc.
*/
+#include <arpa/inet.h>
+#include <nm-connection.h>
+#include <nm-settings-interface.h>
+#include <nm-setting-connection.h>
+#include <nm-setting-serial.h>
+#include <nm-setting-ppp.h>
+#include <nm-setting-gsm.h>
+#include <nm-setting-ip4-config.h>
+#include <nm-utils.h>
+
#include "nm-gsm-provider.h"
#include "nm-gsm-item.h"
+#include "libnm-gtk-gsm-device.h"
+#include "nm-gsm-pin-request-item.h"
+#include "nm-mobile-providers.h"
+#include "gconf-helpers.h"
#include "utils.h"
G_DEFINE_TYPE (NMGsmProvider, nm_gsm_provider, NM_TYPE_DEVICE_PROVIDER)
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NM_TYPE_GSM_PROVIDER, NMGsmProviderPrivate))
+
+typedef struct {
+ gboolean usable;
+} NMGsmProviderPrivate;
+
NMItemProvider *
nm_gsm_provider_new (NMClient *client,
NMGsmDevice *device)
@@ -41,11 +61,16 @@ gsm_added (NMItemProvider *provider,
NMSettingsConnectionInterface *connection)
{
NMDeviceProvider *device_provider = NM_DEVICE_PROVIDER (provider);
+ NMGsmProviderPrivate *priv;
NMDevice *device;
if (!nm_device_provider_ready (device_provider))
return;
+ priv = GET_PRIVATE (provider);
+ if (!priv->usable)
+ return;
+
device = nm_device_provider_get_device (device_provider);
if (utils_connection_valid_for_device (NM_CONNECTION (connection), device, NULL)) {
NMListItem *item;
@@ -55,6 +80,193 @@ gsm_added (NMItemProvider *provider,
}
}
+static NMConnection *
+mobile_new_connection (NMMobileProvider *provider,
+ NMMobileAccessMethod *method)
+{
+ NMConnection *connection;
+ NMSetting *type_setting;
+ NMSetting *setting;
+ char *name;
+ char *uuid;
+
+ connection = nm_connection_new ();
+
+ if (method->type == NM_MOBILE_ACCESS_METHOD_TYPE_GSM) {
+ type_setting = nm_setting_gsm_new ();
+ g_object_set (type_setting,
+ NM_SETTING_GSM_NUMBER, "*99#",
+ NM_SETTING_GSM_USERNAME, method->username,
+ NM_SETTING_GSM_PASSWORD, method->password,
+ NM_SETTING_GSM_APN, method->gsm_apn,
+ NULL);
+
+ /* FIXME: Choose the network_id more intelligently */
+ if (g_slist_length (method->gsm_mcc_mnc) == 1) {
+ NMGsmMccMnc *mcc_mnc = (NMGsmMccMnc *) method->gsm_mcc_mnc->data;
+ char *network_id;
+
+ network_id = g_strconcat (mcc_mnc->mcc, mcc_mnc->mnc, NULL);
+ g_object_set (type_setting,
+ NM_SETTING_GSM_NETWORK_ID, network_id,
+ NULL);
+
+ g_free (network_id);
+ }
+ } else
+ g_assert_not_reached ();
+
+ nm_connection_add_setting (connection, type_setting);
+
+ if (method->gateway || method->dns) {
+ GSList *iter;
+
+ setting = nm_setting_ip4_config_new ();
+ g_object_set (setting, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL);
+
+ for (iter = method->dns; iter; iter = iter->next) {
+ struct in_addr addr;
+
+ if (inet_pton (AF_INET, (char *) iter->data, &addr) > 0)
+ nm_setting_ip4_config_add_dns (NM_SETTING_IP4_CONFIG (setting), addr.s_addr);
+ }
+
+ /* I'd rather not use the gateway from providers database */
+ /* if (method->gateway) */
+
+ nm_connection_add_setting (connection, setting);
+ }
+
+ /* Serial setting */
+ setting = nm_setting_serial_new ();
+ g_object_set (setting,
+ NM_SETTING_SERIAL_BAUD, 115200,
+ NM_SETTING_SERIAL_BITS, 8,
+ NM_SETTING_SERIAL_PARITY, 'n',
+ NM_SETTING_SERIAL_STOPBITS, 1,
+ NULL);
+
+ nm_connection_add_setting (connection, setting);
+
+ setting = nm_setting_ppp_new ();
+ nm_connection_add_setting (connection, setting);
+
+ setting = nm_setting_connection_new ();
+ uuid = nm_utils_uuid_generate ();
+ name = g_strdup_printf ("Mobile %s", provider->name);
+
+ g_object_set (setting,
+ NM_SETTING_CONNECTION_ID, name,
+ NM_SETTING_CONNECTION_TYPE, nm_setting_get_name (type_setting),
+ NM_SETTING_CONNECTION_AUTOCONNECT, FALSE,
+ NM_SETTING_CONNECTION_UUID, uuid,
+ NULL);
+ g_free (uuid);
+ g_free (name);
+ nm_connection_add_setting (connection, setting);
+
+ return connection;
+}
+
+static void
+got_imsi (GObject *obj, GAsyncResult *result, gpointer user_data)
+{
+ NMGsmDevice *device = NM_GSM_DEVICE (obj);
+ char *imsi;
+ GHashTable *providers;
+ NMMobileProvider *provider = NULL;
+ NMMobileAccessMethod *access_method = NULL;
+ GError *error = NULL;
+
+ imsi = nm_gsm_device_get_imsi_finish (device, result, &error);
+ if (error) {
+ g_warning ("Reading IMSI failed: %s", error->message);
+ g_clear_error (&error);
+ return;
+ }
+
+ g_message ("Got IMSI: %s", imsi);
+ providers = nm_mobile_providers_parse (NULL);
+ if (nm_mobile_provider_lookup (providers, NM_MOBILE_ACCESS_METHOD_TYPE_GSM, imsi, &provider, &access_method)) {
+ NMConnection *connection;
+
+ g_message ("Provider %s", provider->name);
+ g_message ("method %s, apn %s", access_method->name, access_method->gsm_apn);
+ connection = mobile_new_connection (provider, access_method);
+ if (connection) {
+ g_message ("Successfully created new connection");
+ /* Just add it to GConf, we'll get notified when that succeeds */
+ nm_gconf_write_connection (connection, NULL, NULL);
+ g_object_unref (connection);
+ }
+ }
+
+ g_hash_table_destroy (providers);
+ g_free (imsi);
+ GET_PRIVATE (user_data)->usable = TRUE;
+}
+
+static void
+modem_became_usable (NMGsmProvider *self)
+{
+ NMGsmDevice *device;
+ GSList *list;
+ GSList *iter;
+ gboolean have_connections = FALSE;
+
+ device = NM_GSM_DEVICE (nm_device_provider_get_device (NM_DEVICE_PROVIDER (self)));
+
+ /* Do we have a configuration yet? */
+ list = nm_item_provider_get_connections (NM_ITEM_PROVIDER (self));
+ for (iter = list; iter; iter = iter->next) {
+ NMSettingsConnectionInterface *connection = (NMSettingsConnectionInterface *) iter->data;
+ NMListItem *item;
+
+ if (!utils_connection_valid_for_device (NM_CONNECTION (connection), NM_DEVICE (device), NULL))
+ continue;
+
+ item = nm_gsm_item_new (nm_item_provider_get_client (NM_ITEM_PROVIDER (self)), device, connection);
+ nm_item_provider_item_added (NM_ITEM_PROVIDER (self), item);
+ have_connections = TRUE;
+ }
+
+ if (have_connections)
+ GET_PRIVATE (self)->usable = TRUE;
+ else
+ /* No? let's try to create one automagically */
+ nm_gsm_device_get_imsi (device, got_imsi, self);
+}
+
+static void
+modem_enabled (GObject *obj, GAsyncResult *result, gpointer user_data)
+{
+ NMGsmDevice *device = NM_GSM_DEVICE (obj);
+ NMGsmProvider *self = NM_GSM_PROVIDER (user_data);
+ GError *error = NULL;
+ gboolean success;
+
+ success = nm_gsm_device_enable_finish (device, result, &error);
+ if (error) {
+ g_warning ("Modem enable failed: %s", error->message);
+ g_clear_error (&error);
+ } else {
+ g_debug ("Modem enabled successfully");
+ }
+
+ modem_became_usable (self);
+}
+
+static gboolean
+initial_pin_check (gpointer data)
+{
+ NMGsmDevice *device;
+
+ device = NM_GSM_DEVICE (nm_device_provider_get_device (NM_DEVICE_PROVIDER (data)));
+ nm_gsm_device_enable (device, TRUE, modem_enabled, data);
+
+ return FALSE;
+}
+
/*****************************************************************************/
static void
@@ -63,9 +275,28 @@ nm_gsm_provider_init (NMGsmProvider *self)
}
static void
+constructed (GObject *object)
+{
+ GSource *source;
+
+ if (G_OBJECT_CLASS (nm_gsm_provider_parent_class)->constructed)
+ G_OBJECT_CLASS (nm_gsm_provider_parent_class)->constructed (object);
+
+ source = g_idle_source_new ();
+ g_source_set_closure (source, g_cclosure_new_object (G_CALLBACK (initial_pin_check), object));
+ g_source_attach (source, NULL);
+ g_source_unref (source);
+}
+
+static void
nm_gsm_provider_class_init (NMGsmProviderClass *klass)
{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMItemProviderClass *item_class = NM_ITEM_PROVIDER_CLASS (klass);
+ g_type_class_add_private (object_class, sizeof (NMGsmProviderPrivate));
+
+ object_class->constructed = constructed;
+
item_class->connection_added = gsm_added;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
