diff options
| author | Ajay Garg <ajay@activitycentral.com> | 2012-08-31 08:21:42 (GMT) |
|---|---|---|
| committer | Ajay Garg <ajay@activitycentral.com> | 2012-08-31 08:21:42 (GMT) |
| commit | 9f3849453a47c915f398e74d0428ddf5556434ac (patch) | |
| tree | be3d8ac30249ff898bd6d564766cfe2253998d1a | |
| parent | 698a300045b19ac40985a9ea9bd90a264de032a5 (diff) | |
ac#2233: Change the behaviour of Sugar: not connect to adhoc networks by default.
This behaviour is controlled by the gconf-key "/desktop/sugar/network/autoconnect_to_adhoc_networks".
| -rw-r--r-- | rpms/sugar/0135-ac-2233-Change-the-behaviour-of-Sugar-not-connect-to.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/rpms/sugar/0135-ac-2233-Change-the-behaviour-of-Sugar-not-connect-to.patch b/rpms/sugar/0135-ac-2233-Change-the-behaviour-of-Sugar-not-connect-to.patch new file mode 100644 index 0000000..9d2eb94 --- /dev/null +++ b/rpms/sugar/0135-ac-2233-Change-the-behaviour-of-Sugar-not-connect-to.patch @@ -0,0 +1,45 @@ +From f89371d20ec99a545c23cd8b122a5188426c734e Mon Sep 17 00:00:00 2001 +From: Ajay Garg <ajay@activitycentral.com> +Date: Fri, 31 Aug 2012 13:37:02 +0530 +Subject: [PATCH] ac#2233: Change the behaviour of Sugar: not connect to adhoc networks by default. +Organization: Sugar Labs Foundation +Signed-off-by: Ajay Garg <ajay@activitycentral.com> +--- + +This behaviour is controlled by the gconf-key +"/desktop/sugar/network/autoconnect_to_adhoc_networks". + + + src/jarabe/desktop/meshbox.py | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py +index c111e7e..950ac12 100644 +--- a/src/jarabe/desktop/meshbox.py ++++ b/src/jarabe/desktop/meshbox.py +@@ -63,6 +63,11 @@ _OLPC_MESH_ICON_NAME = 'network-mesh' + _AUTOSEARCH_TIMEOUT = 1000 + _FILTERED_ALPHA = 0.33 + ++AUTOCONNECT_TO_ADHOC_NETWORKS_GCONF_KEY = '/desktop/sugar/network/autoconnect_to_adhoc_networks' ++client = gconf.client_get_default() ++AUTOCONNECT_TO_ADHOC_NETWORKS_GCONF_VALUE = client.get_bool(AUTOCONNECT_TO_ADHOC_NETWORKS_GCONF_KEY) ++ ++ + + class _ActivityIcon(CanvasIcon): + def __init__(self, model, file_name, xo_color, +@@ -621,7 +626,9 @@ class MeshBox(gtk.VBox): + self._add_adhoc_network_icon(1) + self._add_adhoc_network_icon(6) + self._add_adhoc_network_icon(11) +- self._adhoc_manager.autoconnect() ++ ++ if AUTOCONNECT_TO_ADHOC_NETWORKS_GCONF_VALUE == True: ++ self._adhoc_manager.autoconnect() + + def remove_adhoc_networks(self): + for icon in self._adhoc_networks: +-- +1.7.4.4 + |