NetworkManager

Merge lp://qastaging/~awe/network-manager/ubuntu.0.7.1.dbus.scannow into lp://qastaging/~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://qastaging/~awe/network-manager/ubuntu.0.7.1.dbus.scannow
Merge into: lp://qastaging/~network-manager/network-manager/ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~awe/network-manager/ubuntu.0.7.1.dbus.scannow
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+8716@code.qastaging.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
=== modified file 'changelog'
--- changelog 2009-07-06 14:33:53 +0000
+++ changelog 2009-07-13 22:23:03 +0000
@@ -1,3 +1,13 @@
1network-manager (0.7.1.git.4.364ab2f86-0ubuntu2) UNRELEASED; urgency=low
2
3 [C. Scott Ananian <cscott@litl.com>]
4
5 * Add DBUS ScanNow capability
6 - add patches/nm_scannow.patch
7 - update patches/series
8
9 -- Tony Espy <espy@ubuntu.com> Mon, 13 Jul 2009 17:39:18 -0400
10
1network-manager (0.7.1.git.4.364ab2f86-0ubuntu1) UNRELEASED; urgency=low11network-manager (0.7.1.git.4.364ab2f86-0ubuntu1) UNRELEASED; urgency=low
212
3 * upstream snapshot 2009-07-06 14:14:41 (GMT)13 * upstream snapshot 2009-07-06 14:14:41 (GMT)
414
=== added file 'patches/nm-scannow.patch'
--- patches/nm-scannow.patch 1970-01-01 00:00:00 +0000
+++ patches/nm-scannow.patch 2009-07-13 22:23:03 +0000
@@ -0,0 +1,52 @@
1commit d4df20a021d1a9d45dd34e0127d4ae6106c17631
2Author: C. Scott Ananian <cscott@litl.com>
3Date: Thu Mar 26 14:45:23 2009 -0400
4
5 Add ScanNow command to org.freedesktop.NetworkManager.Device.Wireless
6
7diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
8index 6b31b3a..69aaf56 100644
9--- a/introspection/nm-device-wifi.xml
10+++ b/introspection/nm-device-wifi.xml
11@@ -13,6 +13,12 @@
12 Get the list of access points visible to this device.
13 </tp:docstring>
14 </method>
15+ <method name="ScanNow">
16+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_scan_now"/>
17+ <tp:docstring>
18+ Request an immediate scan of visible access points.
19+ </tp:docstring>
20+ </method>
21
22 <property name="HwAddress" type="s" access="read">
23 <tp:docstring>
24diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
25index f0ed948..9d677ba 100644
26--- a/src/nm-device-wifi.c
27+++ b/src/nm-device-wifi.c
28@@ -56,6 +56,8 @@
29 static gboolean impl_device_get_access_points (NMDeviceWifi *device,
30 GPtrArray **aps,
31 GError **err);
32+static gboolean impl_device_scan_now (NMDeviceWifi *device,
33+ GError **err);
34
35 #include "nm-device-wifi-glue.h"
36
37@@ -1149,6 +1151,15 @@ impl_device_get_access_points (NMDeviceWifi *self,
38 return TRUE;
39 }
40
41+static gboolean
42+impl_device_scan_now (NMDeviceWifi *self, GError **err)
43+{
44+ /* Request a scan to get latest results */
45+ cancel_pending_scan(self);
46+ request_wireless_scan(self);
47+ return TRUE;
48+}
49+
50 /*
51 * nm_device_get_mode
52 *
053
=== modified file 'patches/series'
--- patches/series 2009-04-14 10:42:33 +0000
+++ patches/series 2009-07-13 22:23:03 +0000
@@ -12,3 +12,4 @@
12lp199140_dont_manage_virtual_devices.patch12lp199140_dont_manage_virtual_devices.patch
13lp356517_manage_virtual_devices_on_armel.patch13lp356517_manage_virtual_devices_on_armel.patch
1414
15nm-scannow.patch

Subscribers

People subscribed via source and target branches