← Back to branch summary

~ubuntu-branches/ubuntu/vivid/modemmanager/vivid-proposed

« back to all changes in this revision

Viewing changes to plugins/mm-modem-novatel-cdma.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2011-06-16 17:12:41 UTC
  • mfrom: (16.1.1 oneiric)
  • Revision ID: james.westby@ubuntu.com-20110616171241-k8vgsdmbpsvx467q
Tags: 0.4.997-1
* debian/watch: Switch to .bz2 tarballs.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/mm-modem-novatel-cdma.c
122
122
    MMModemCdma *parent_iface;
123
123
    int qual;
124
124
 
125
 
    info->error = mm_modem_check_removed (info->modem, error);
126
 
    if (info->error) {
127
 
        if (info->modem) {
128
 
            /* Fallback to parent's method */
129
 
            g_clear_error (&info->error);
130
 
            parent_iface = g_type_interface_peek_parent (MM_MODEM_CDMA_GET_INTERFACE (info->modem));
131
 
            parent_iface->get_signal_quality (MM_MODEM_CDMA (info->modem), parent_csq_done, info);
132
 
        } else
133
 
            mm_callback_info_schedule (info);
 
125
    /* If the modem has already been removed, return without
 
126
     * scheduling callback */
 
127
    if (mm_callback_info_check_modem_removed (info))
 
128
        return;
134
129
 
 
130
    if (error) {
 
131
        /* Fallback to parent's method */
 
132
        parent_iface = g_type_interface_peek_parent (MM_MODEM_CDMA_GET_INTERFACE (info->modem));
 
133
        parent_iface->get_signal_quality (MM_MODEM_CDMA (info->modem), parent_csq_done, info);
135
134
        return;
136
135
    }
137
136
 
149
148
        info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
150
149
                                    "%s", "Could not parse signal quality results");
151
150
    }
152
 
        
 
151
 
153
152
    mm_callback_info_schedule (info);
154
153
}
155
154