diff options
Diffstat (limited to 'src/jarabe/desktop')
| -rw-r--r-- | src/jarabe/desktop/keydialog.py | 5 | ||||
| -rw-r--r-- | src/jarabe/desktop/meshbox.py | 4 | ||||
| -rw-r--r-- | src/jarabe/desktop/networkviews.py | 34 |
3 files changed, 22 insertions, 21 deletions
diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py index d8c8cf9..62db06f 100644 --- a/src/jarabe/desktop/keydialog.py +++ b/src/jarabe/desktop/keydialog.py @@ -99,8 +99,9 @@ class KeyDialog(gtk.Dialog): self.set_has_separator(False) - label = gtk.Label("A wireless encryption key is required for\n" \ - " the wireless network '%s'." % self._ssid) + display_name = network.ssid_to_display_name(ssid) + label = gtk.Label(_("A wireless encryption key is required for\n" + " the wireless network '%s'.") % (display_name, )) self.vbox.pack_start(label) self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 6d5bb48..c111e7e 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -554,13 +554,13 @@ class MeshBox(gtk.VBox): # if we have mesh hardware, ignore OLPC mesh networks that appear as # normal wifi networks if len(self._mesh) > 0 and ap.mode == network.NM_802_11_MODE_ADHOC \ - and ap.name == 'olpc-mesh': + and ap.ssid == 'olpc-mesh': logging.debug('ignoring OLPC mesh IBSS') ap.disconnect() return if self._adhoc_manager is not None and \ - network.is_sugar_adhoc_network(ap.name) and \ + network.is_sugar_adhoc_network(ap.ssid) and \ ap.mode == network.NM_802_11_MODE_ADHOC: if old_hash_value is None: # new Ad-hoc network finished initializing diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py index d36aeb3..6c268ae 100644 --- a/src/jarabe/desktop/networkviews.py +++ b/src/jarabe/desktop/networkviews.py @@ -256,7 +256,8 @@ class WirelessNetworkView(CanvasPulsingIcon): self._disconnect_item = None self._connect_item = None self._filtered = False - self._name = initial_ap.name + self._ssid = initial_ap.ssid + self._display_name = network.ssid_to_display_name(self._ssid) self._mode = initial_ap.mode self._strength = initial_ap.strength self._flags = initial_ap.flags @@ -267,11 +268,11 @@ class WirelessNetworkView(CanvasPulsingIcon): self._color = None if self._mode == network.NM_802_11_MODE_ADHOC and \ - network.is_sugar_adhoc_network(self._name): + network.is_sugar_adhoc_network(self._ssid): self._color = profile.get_color() else: sha_hash = hashlib.sha1() - data = self._name + hex(self._flags) + data = self._ssid + hex(self._flags) sha_hash.update(data) digest = hash(sha_hash.digest()) index = digest % len(xocolor.colors) @@ -317,8 +318,8 @@ class WirelessNetworkView(CanvasPulsingIcon): icon_size=style.STANDARD_ICON_SIZE, badge_name=self.props.badge_name) - p = palette.Palette(primary_text=glib.markup_escape_text(self._name), - icon=self._palette_icon) + label = glib.markup_escape_text(self._display_name) + p = palette.Palette(primary_text=label, icon=self._palette_icon) self._connect_item = MenuItem(_('Connect'), 'dialog-ok') self._connect_item.connect('activate', self.__connect_activate_cb) @@ -376,7 +377,7 @@ class WirelessNetworkView(CanvasPulsingIcon): def _update_icon(self): if self._mode == network.NM_802_11_MODE_ADHOC and \ - network.is_sugar_adhoc_network(self._name): + network.is_sugar_adhoc_network(self._ssid): channel = max([1] + [ap.channel for ap in self._access_points.values()]) if self._device_state == network.DEVICE_STATE_ACTIVATED and \ @@ -402,7 +403,7 @@ class WirelessNetworkView(CanvasPulsingIcon): def _update_badge(self): if self._mode != network.NM_802_11_MODE_ADHOC: - if network.find_connection_by_ssid(self._name) is not None: + if network.find_connection_by_ssid(self._ssid) is not None: self.props.badge_name = 'emblem-favorite' self._palette_icon.props.badge_name = 'emblem-favorite' elif self._flags == network.NM_802_11_AP_FLAGS_PRIVACY: @@ -431,7 +432,7 @@ class WirelessNetworkView(CanvasPulsingIcon): self._palette.props.secondary_text = _('Connecting...') self.props.pulsing = True elif state == network.DEVICE_STATE_ACTIVATED: - connection = network.find_connection_by_ssid(self._name) + connection = network.find_connection_by_ssid(self._ssid) if connection is not None: if self._mode == network.NM_802_11_MODE_INFRA: connection.set_connected() @@ -457,7 +458,7 @@ class WirelessNetworkView(CanvasPulsingIcon): def _disconnect_activate_cb(self, item): if self._mode == network.NM_802_11_MODE_INFRA: - connection = network.find_connection_by_ssid(self._name) + connection = network.find_connection_by_ssid(self._ssid) if connection: connection.disable_autoconnect() @@ -594,22 +595,22 @@ class WirelessNetworkView(CanvasPulsingIcon): self._connect() def _connect(self): - connection = network.find_connection_by_ssid(self._name) + connection = network.find_connection_by_ssid(self._ssid) if connection is None: settings = Settings() self._settings = settings - settings.connection.id = 'Auto ' + self._name + settings.connection.id = 'Auto ' + self._display_name uuid = settings.connection.uuid = unique_id() self._uuid = uuid settings.connection.type = '802-11-wireless' - settings.wireless.ssid = self._name + settings.wireless.ssid = self._ssid if self._mode == network.NM_802_11_MODE_INFRA: settings.wireless.mode = 'infrastructure' 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): + if network.is_sugar_adhoc_network(self._ssid): settings.ip4_config = IP4Config() settings.ip4_config.method = 'link-local' @@ -641,12 +642,12 @@ class WirelessNetworkView(CanvasPulsingIcon): logging.error('Failed to activate connection: %s', err) def set_filter(self, query): - self._filtered = self._name.lower().find(query) == -1 + self._filtered = self._display_name.lower().find(query) == -1 self._update_icon() self._update_color() def create_keydialog(self, settings, response): - keydialog.create(self._name, self._flags, self._wpa_flags, + keydialog.create(self._ssid, self._flags, self._wpa_flags, self._rsn_flags, self._device_caps, settings, response) @@ -687,7 +688,7 @@ class WirelessNetworkView(CanvasPulsingIcon): def is_olpc_mesh(self): return self._mode == network.NM_802_11_MODE_ADHOC \ - and self.name == 'olpc-mesh' + and self._ssid == 'olpc-mesh' def remove_all_aps(self): for ap in self._access_points.values(): @@ -855,7 +856,6 @@ class OlpcMeshView(CanvasPulsingIcon): self._disconnect_item = None self._connect_item = None self._filtered = False - self._name = '' self._device_state = None self._active = False device = mesh_mgr.mesh_device |