Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch')
-rw-r--r--rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch37
1 files changed, 23 insertions, 14 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