diff options
| author | Steven M. Parrish <smparrish@gmail.com> | 2010-12-04 14:09:56 (GMT) |
|---|---|---|
| committer | Steven M. Parrish <smparrish@gmail.com> | 2010-12-04 14:09:56 (GMT) |
| commit | 53577867e8b7e7c9c1c09502a6557459ea8a51be (patch) | |
| tree | ead032e24215707a6dd1b3a231dd397fd49b7176 | |
| parent | ef66ec7c96c7fe260948f9167dbc1ff06c2eaf3b (diff) | |
Fix adhoc issues
| -rw-r--r-- | rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch | 37 | ||||
| -rw-r--r-- | rpms/sugar/sl1610-default-ad-hoc-networks.patch | 3 | ||||
| -rw-r--r-- | rpms/sugar/sugar.spec | 3 |
3 files changed, 26 insertions, 17 deletions
diff --git a/rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch b/rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch index 9c2401c..cfa3a9b 100644 --- a/rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch +++ b/rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch @@ -1,14 +1,23 @@ ---- a/src/jarabe/desktop/meshbox.py -+++ b/src/jarabe/desktop/meshbox.py -@@ -383,8 +383,9 @@ class WirelessNetworkView(CanvasPulsingIcon): - elif self._mode == network.NM_802_11_MODE_ADHOC: - settings.wireless.mode = 'adhoc' - settings.wireless.band = 'bg' -- settings.ip4_config = IP4Config() -- settings.ip4_config.method = 'link-local' -+ if network.is_sugar_adhoc_network(self._name): -+ settings.ip4_config = IP4Config() -+ settings.ip4_config.method = 'link-local' - - wireless_security = self._get_security() - settings.wireless_security = wireless_security +diff -crB sugar-0.88.1/src/jarabe/desktop/meshbox.py sugar-0.88.1.41/src/jarabe/desktop/meshbox.py +*** sugar-0.88.1/src/jarabe/desktop/meshbox.py 2010-12-04 08:43:37.547173317 -0500 +--- sugar-0.88.1.41/src/jarabe/desktop/meshbox.py 2010-12-04 08:47:07.556160591 -0500 +*************** +*** 383,390 **** + elif self._mode == network.NM_802_11_MODE_ADHOC: + settings.wireless.mode = 'adhoc' + settings.wireless.band = 'bg' +! settings.ip4_config = IP4Config() +! settings.ip4_config.method = 'link-local' + + wireless_security = self._get_security() + settings.wireless_security = wireless_security +--- 383,391 ---- + elif self._mode == network.NM_802_11_MODE_ADHOC: + settings.wireless.mode = 'adhoc' + settings.wireless.band = 'bg' +! if network.is_sugar_adhoc_network(self._name): +! settings.ip4_config = IP4Config() +! settings.ip4_config.method = 'link-local' + + wireless_security = self._get_security() + settings.wireless_security = wireless_security diff --git a/rpms/sugar/sl1610-default-ad-hoc-networks.patch b/rpms/sugar/sl1610-default-ad-hoc-networks.patch index 1db172f..c415f0a 100644 --- a/rpms/sugar/sl1610-default-ad-hoc-networks.patch +++ b/rpms/sugar/sl1610-default-ad-hoc-networks.patch @@ -685,7 +685,7 @@ index bc7f59b..ae63ad2 100644 # we don't keep an index of ap object path to network, but since # we'll only ever have a handful of networks, just try them all... for net in self.wireless_networks.values(): -@@ -1104,6 +1304,26 @@ class MeshBox(gtk.VBox): +@@ -1104,6 +1304,25 @@ class MeshBox(gtk.VBox): # it (e.g. olpc-mesh adhoc network) logging.debug('Can not remove access point %s' % ap_o) @@ -700,7 +700,6 @@ index bc7f59b..ae63ad2 100644 + + def remove_adhoc_networks(self): + for icon in self._adhoc_networks: -+ icon.disconnect() + self._layout.remove(icon) + self._adhoc_networks = [] + diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec index 3de9a92..c29450d 100644 --- a/rpms/sugar/sugar.spec +++ b/rpms/sugar/sugar.spec @@ -3,7 +3,7 @@ Summary: Constructionist learning platform Name: sugar Version: 0.88.1 -Release: 5.40dxo%{?dist} +Release: 5.41dxo%{?dist} URL: http://sugarlabs.org/ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 @@ -211,6 +211,7 @@ multiple instances of sugar. %patch508 -p1 %patch509 -p1 %patch510 -p1 +%patch511 -p1 %patch601 -p1 %patch602 -p1 |