NetworkManager

Merge lp://staging/~awe/network-manager/ubuntu.0.7.1.dbus.scannow into lp://staging/~network-manager/network-manager/ubuntu.0.7.1

  1. ubuntu.0.7.1.dbus.scannow
  2. Merge into ubuntu.0.7.1
Proposed by Tony Espy
Status: Rejected
Rejected by: Mathieu Trudel-Lapierre
Proposed branch: lp://staging/~awe/network-manager/ubuntu.0.7.1.dbus.scannow
Merge into: lp://staging/~network-manager/network-manager/ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~awe/network-manager/ubuntu.0.7.1.dbus.scannow
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+8716@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tony Espy (awe) wrote :

Here's my ScanNow merge...

Unmerged revisions

57. By Tony Espy

* Add DBUS ScanNow capability
    - add patches/nm_scannow.patch
    - update patches/series

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'changelog'
2--- changelog 2009-07-06 14:33:53 +0000
3+++ changelog 2009-07-13 22:23:03 +0000
4@@ -1,3 +1,13 @@
5+network-manager (0.7.1.git.4.364ab2f86-0ubuntu2) UNRELEASED; urgency=low
6+
7+ [C. Scott Ananian <cscott@litl.com>]
8+
9+ * Add DBUS ScanNow capability
10+ - add patches/nm_scannow.patch
11+ - update patches/series
12+
13+ -- Tony Espy <espy@ubuntu.com> Mon, 13 Jul 2009 17:39:18 -0400
14+
15 network-manager (0.7.1.git.4.364ab2f86-0ubuntu1) UNRELEASED; urgency=low
16
17 * upstream snapshot 2009-07-06 14:14:41 (GMT)
18
19=== added file 'patches/nm-scannow.patch'
20--- patches/nm-scannow.patch 1970-01-01 00:00:00 +0000
21+++ patches/nm-scannow.patch 2009-07-13 22:23:03 +0000
22@@ -0,0 +1,52 @@
23+commit d4df20a021d1a9d45dd34e0127d4ae6106c17631
24+Author: C. Scott Ananian <cscott@litl.com>
25+Date: Thu Mar 26 14:45:23 2009 -0400
26+
27+ Add ScanNow command to org.freedesktop.NetworkManager.Device.Wireless
28+
29+diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
30+index 6b31b3a..69aaf56 100644
31+--- a/introspection/nm-device-wifi.xml
32++++ b/introspection/nm-device-wifi.xml
33+@@ -13,6 +13,12 @@
34+ Get the list of access points visible to this device.
35+ </tp:docstring>
36+ </method>
37++ <method name="ScanNow">
38++ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_scan_now"/>
39++ <tp:docstring>
40++ Request an immediate scan of visible access points.
41++ </tp:docstring>
42++ </method>
43+
44+ <property name="HwAddress" type="s" access="read">
45+ <tp:docstring>
46+diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
47+index f0ed948..9d677ba 100644
48+--- a/src/nm-device-wifi.c
49++++ b/src/nm-device-wifi.c
50+@@ -56,6 +56,8 @@
51+ static gboolean impl_device_get_access_points (NMDeviceWifi *device,
52+ GPtrArray **aps,
53+ GError **err);
54++static gboolean impl_device_scan_now (NMDeviceWifi *device,
55++ GError **err);
56+
57+ #include "nm-device-wifi-glue.h"
58+
59+@@ -1149,6 +1151,15 @@ impl_device_get_access_points (NMDeviceWifi *self,
60+ return TRUE;
61+ }
62+
63++static gboolean
64++impl_device_scan_now (NMDeviceWifi *self, GError **err)
65++{
66++ /* Request a scan to get latest results */
67++ cancel_pending_scan(self);
68++ request_wireless_scan(self);
69++ return TRUE;
70++}
71++
72+ /*
73+ * nm_device_get_mode
74+ *
75
76=== modified file 'patches/series'
77--- patches/series 2009-04-14 10:42:33 +0000
78+++ patches/series 2009-07-13 22:23:03 +0000
79@@ -12,3 +12,4 @@
80 lp199140_dont_manage_virtual_devices.patch
81 lp356517_manage_virtual_devices_on_armel.patch
82
83+nm-scannow.patch

Subscribers

People subscribed via source and target branches