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

« back to all changes in this revision

Viewing changes to src/mm-manager.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:
322
322
{
323
323
    MMModem *modem = MM_MODEM (val);
324
324
    GPtrArray **devices = (GPtrArray **) user_data;
325
 
    const char *path;
326
325
 
327
326
    if (mm_modem_get_valid (modem)) {
 
327
        const char *path;
 
328
 
328
329
        path = g_object_get_data (G_OBJECT (modem), DBUS_PATH_TAG);
329
 
        g_return_if_fail (path != NULL);
330
 
        g_ptr_array_add (*devices, g_strdup (path));
 
330
        /* A valid modem without dbus path may happen when enumerating devices
 
331
         * while there is an ongoing modem probing. */
 
332
        if (path)
 
333
            g_ptr_array_add (*devices, g_strdup (path));
331
334
    }
332
335
}
333
336