← Back to branch summary

~ubuntu-branches/ubuntu/karmic/modemmanager/karmic

« back to all changes in this revision

Viewing changes to src/mm-plugin-base.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-10-06 01:02:12 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20091006010212-ygs0espe64jw0qnn
Tags: 0.2.git.20091003t063318.aa78b5f-0ubuntu1
https://launchpad.net/bugs/430576
https://launchpad.net/bugs/416126
New upstream snapshot: 2009-10-03 06:33:18 (GMT)
+ aa78b5f5e5319e04f5b57f928bfab69dd4b93d88
* fixes
  - LP: #430576 - refuse to connect over Nokia N85, turns off the handset  
  - LP: #416126 - various unsolicited messages for mbm cause fail on connect

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mm-plugin-base.c
664
664
get_driver_name (GUdevDevice *device)
665
665
{
666
666
    GUdevDevice *parent = NULL;
667
 
    const char *driver;
 
667
    const char *driver, *subsys;
668
668
    char *ret = NULL;
669
669
 
670
670
    driver = g_udev_device_get_driver (device);
672
672
        parent = g_udev_device_get_parent (device);
673
673
        if (parent)
674
674
            driver = g_udev_device_get_driver (parent);
 
675
 
 
676
        /* Check for bluetooth; it's driver is a bunch of levels up so we
 
677
         * just check for the subsystem of the parent being bluetooth.
 
678
         */
 
679
        if (!driver && parent) {
 
680
            subsys = g_udev_device_get_subsystem (parent);
 
681
            if (subsys && !strcmp (subsys, "bluetooth"))
 
682
                driver = "bluetooth";
 
683
        }
675
684
    }
676
685
 
677
686
    if (driver)
694
703
    g_return_val_if_fail (child != NULL, NULL);
695
704
 
696
705
    iter = g_object_ref (child);
697
 
    while (iter && i++ < 5) {
 
706
    while (iter && i++ < 8) {
698
707
        subsys = g_udev_device_get_subsystem (iter);
699
708
        if (subsys) {
700
709
            if (is_usb || !strcmp (subsys, "usb")) {