← Back to branch summary

~ubuntu-branches/debian/sid/network-manager/sid

« back to all changes in this revision

Viewing changes to src/nm-device-olpc-mesh.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2011-11-03 21:32:50 UTC
  • mfrom: (1.4.6)
  • Revision ID: package-import@ubuntu.com-20111103213250-w49ucjmux3hbwnta
Tags: 0.9.1.95-1
http://bugs.debian.org/638995
http://bugs.debian.org/642912
http://bugs.debian.org/546893
http://bugs.debian.org/624159
http://bugs.debian.org/637005
http://bugs.debian.org/641904
* New upstream release (0.9.2 rc1).
  - Fix connection sharing with newer iptables versions. (Closes: #638995)
  - Fix handling of numeric SSIDs in the keyfile plugin. (Closes: #642912)
* debian/watch: Track .xz tarballs.
* debian/libnm-util2.symbols: Add new symbols for libnm-util.
* debian/patches/04-dont-update-routing-and-dns-for-unmanaged-devices.patch
  - Avoid blowing away existing routes and resolv.conf if NM never managed
    any devices. (Closes: #546893, #624159, #637005, #641904)
* debian/control: Add Build-Depends on libglib2.0-doc for proper
  cross-references in the gtk-doc API documentation.
* Enable default hardening options from dpkg-buildflags.
  - Use buildflags.mk snippet in debian/rules.
  - Add Build-Depends on dpkg-dev (>= 1.6.1).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nm-device-olpc-mesh.c
271
271
static gboolean
272
272
real_hw_is_up (NMDevice *device)
273
273
{
274
 
        return nm_system_device_is_up (device);
 
274
        return nm_system_iface_is_up (nm_device_get_ip_ifindex (device));
275
275
}
276
276
 
277
277
static gboolean
278
278
real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
279
279
{
280
 
        return nm_system_device_set_up_down (dev, TRUE, no_firmware);
 
280
        return nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), TRUE, no_firmware);
281
281
}
282
282
 
283
283
static void
284
284
real_hw_take_down (NMDevice *dev)
285
285
{
286
 
        nm_system_device_set_up_down (dev, FALSE, NULL);
 
286
        nm_system_iface_set_up (nm_device_get_ip_ifindex (dev), FALSE, NULL);
287
287
}
288
288
 
289
289
static gboolean
653
653
 
654
654
        device_cleanup (self);
655
655
 
656
 
        manager = nm_manager_get (NULL, NULL, NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
 
656
        manager = nm_manager_get ();
657
657
        if (priv->device_added_id)
658
658
                g_signal_handler_disconnect (manager, priv->device_added_id);
659
659
        g_object_unref (manager);
852
852
        priv->companion = other;
853
853
 
854
854
        /* When we've found the companion, stop listening for other devices */
855
 
        manager = nm_manager_get (NULL, NULL, NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
 
855
        manager = nm_manager_get ();
856
856
        if (priv->device_added_id) {
857
857
                g_signal_handler_disconnect (manager, priv->device_added_id);
858
858
                priv->device_added_id = 0;
907
907
        if (priv->device_added_id != 0)
908
908
                return FALSE;
909
909
 
910
 
        manager = nm_manager_get (NULL, NULL, NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
 
910
        manager = nm_manager_get ();
911
911
 
912
912
        priv->device_added_id = g_signal_connect (manager, "device-added",
913
913
                                                  G_CALLBACK (device_added_cb), self);