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

Handle Enable() method correctly when it's already been called.

Browse Source
This commit is contained in:
Tambet Ingo
2008-07-31 15:00:03 +03:00
parent 911b2b6926
commit 710df6f66b
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/mm-modem-huawei.c
+23 -8
View File
@@ -18,6 +18,7 @@ G_DEFINE_TYPE_EXTENDED (MMModemHuawei, mm_modem_huawei, MM_TYPE_GENERIC_GSM,
typedef struct {
MMSerial *monitor_device;
guint watch_id;
} MMModemHuaweiPrivate;
enum {
@@ -136,19 +137,27 @@ enable (MMModem *modem,
{
MMModemHuaweiPrivate *priv = MM_MODEM_HUAWEI_GET_PRIVATE (modem);
parent_class_iface->enable (modem, enable, callback, user_data);
if (enable) {
GIOChannel *channel;
mm_serial_open (priv->monitor_device);
channel = mm_serial_get_io_channel (priv->monitor_device);
g_io_add_watch (channel, G_IO_IN | G_IO_ERR | G_IO_HUP,
monitor_device_got_data, modem);
if (priv->watch_id == 0) {
mm_serial_open (priv->monitor_device);
g_io_channel_unref (channel);
} else
mm_serial_close (priv->monitor_device);
channel = mm_serial_get_io_channel (priv->monitor_device);
priv->watch_id = g_io_add_watch (channel, G_IO_IN | G_IO_ERR | G_IO_HUP,
monitor_device_got_data, modem);
parent_class_iface->enable (modem, enable, callback, user_data);
g_io_channel_unref (channel);
}
} else {
if (priv->watch_id) {
g_source_remove (priv->watch_id);
priv->watch_id = 0;
mm_serial_close (priv->monitor_device);
}
}
}
static gboolean
@@ -526,6 +535,12 @@ finalize (GObject *object)
{
MMModemHuaweiPrivate *priv = MM_MODEM_HUAWEI_GET_PRIVATE (object);
if (priv->watch_id) {
g_source_remove (priv->watch_id);
priv->watch_id = 0;
mm_serial_close (priv->monitor_device);
}
if (priv->monitor_device)
g_object_unref (priv->monitor_device);