diff options
| author | Steven M. Parrish <smparrish@gmail.com> | 2010-11-17 14:31:18 (GMT) |
|---|---|---|
| committer | Steven M. Parrish <smparrish@gmail.com> | 2010-11-17 14:31:18 (GMT) |
| commit | 64218d52c06ecc52e0c1d7ffa1d4cc77bb197e46 (patch) | |
| tree | 6519581b455ee7dcfc0f4e16dcdedaa0b4748d07 /rpms | |
| parent | 5d713c237bfc654132446b5607f91241384e74c6 (diff) | |
Make sure Adhoc is Sugar-Adhoc
Diffstat (limited to 'rpms')
| -rw-r--r-- | rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch | 14 | ||||
| -rw-r--r-- | rpms/sugar/sugar.spec | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch b/rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch new file mode 100644 index 0000000..9c2401c --- /dev/null +++ b/rpms/sugar/0001-Check-Adhoc-is-Sugar-Adhoc.patch @@ -0,0 +1,14 @@ +--- 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 --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec index 4003008..cb79e32 100644 --- a/rpms/sugar/sugar.spec +++ b/rpms/sugar/sugar.spec @@ -65,6 +65,7 @@ Patch507: prevent-multiple-XS-icons-when-re-register.patch Patch508: microformat-updater.patch Patch509: sl1610-default-ad-hoc-networks.patch Patch510: 0001-Share-3g-connection.patch +Patch511: 0001-Check-Adhoc-is-Sugar-Adhoc.patch # tch experimental patches patch601: bundle-Delete-profile-data-only-when-erased.patch |