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

core: fix merge damage

Browse Source
This commit is contained in:
Dan Williams
2010-03-11 16:02:12 -08:00
parent 3ec7e89f11
commit 4d1e00c496
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -673,10 +673,10 @@ mm_generic_gsm_enable_complete (MMGenericGsm *self,
MM_MODEM_STATE_DISABLED, MM_MODEM_STATE_DISABLED,
MM_MODEM_STATE_REASON_NONE); MM_MODEM_STATE_REASON_NONE);
if (priv->primary && mm_serial_port_is_open (priv->primary)) if (priv->primary && mm_serial_port_is_open (MM_SERIAL_PORT (priv->primary)))
mm_serial_port_close (priv->primary); mm_serial_port_close (MM_SERIAL_PORT (priv->primary));
if (priv->secondary && mm_serial_port_is_open (priv->secondary)) if (priv->secondary && mm_serial_port_is_open (MM_SERIAL_PORT (priv->secondary)))
mm_serial_port_close (priv->secondary); mm_serial_port_close (MM_SERIAL_PORT (priv->secondary));
info->error = g_error_copy (error); info->error = g_error_copy (error);
mm_callback_info_schedule (info); mm_callback_info_schedule (info);

4
src/mm-plugin-base.c
View File

@@ -265,7 +265,7 @@ supports_task_dispose (GObject *object)
if (priv->probe_id) if (priv->probe_id)
g_source_remove (priv->probe_id); g_source_remove (priv->probe_id);
if (priv->probe_port) { if (priv->probe_port) {
mm_serial_port_close (priv->probe_port); mm_serial_port_close (MM_SERIAL_PORT (priv->probe_port));
g_object_unref (priv->probe_port); g_object_unref (priv->probe_port);
} }
@@ -391,7 +391,7 @@ port_buffer_full (MMSerialPort *port, GString *buffer, gpointer user_data)
if (!memcmp (&buffer->str[i], *iter, iter_len)) { if (!memcmp (&buffer->str[i], *iter, iter_len)) {
/* Immediately close the port and complete probing */ /* Immediately close the port and complete probing */
priv->probed_caps = 0; priv->probed_caps = 0;
mm_serial_port_close (priv->probe_port); mm_serial_port_close (MM_SERIAL_PORT (priv->probe_port));
probe_complete (task); probe_complete (task);
return; return;
} }

1
src/mm-serial-port.h
View File

@@ -50,7 +50,6 @@ struct _MMSerialPort {
struct _MMSerialPortClass { struct _MMSerialPortClass {
MMPortClass parent; MMPortClass parent;
<<<<<<< HEAD
/* Called for subclasses to parse unsolicited responses. If any recognized /* Called for subclasses to parse unsolicited responses. If any recognized
* unsolicited response is found, it should be removed from the 'response' * unsolicited response is found, it should be removed from the 'response'
* byte array before returning. * byte array before returning.