From e16b2c50892c7ed657d414cba0f15be1d47886c9 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Thu, 24 Dec 2009 15:08:09 +0000
Subject: Only parse colors from ad-hoc network names that contain them (#1604)

---
(limited to 'src/jarabe')

diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 2c58fe6..76880b8 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -86,11 +86,12 @@ class WirelessNetworkView(CanvasPulsingIcon):
         self._connection = None
         self._color = None
 
-        if self._mode == network.NM_802_11_MODE_ADHOC:
+        if self._mode == network.NM_802_11_MODE_ADHOC \
+                and self._name_encodes_colors():
             encoded_color = self._name.split("#", 1)
             if len(encoded_color) == 2:
                 self._color = xocolor.XoColor('#' + encoded_color[1])
-        if self._mode == network.NM_802_11_MODE_INFRA:
+        else:
             sha_hash = hashlib.sha1()
             data = self._name + hex(self._flags)
             sha_hash.update(data)
@@ -142,6 +143,11 @@ class WirelessNetworkView(CanvasPulsingIcon):
                                       path=self._device.object_path,
                                       dbus_interface=_NM_WIRELESS_IFACE)
 
+    def _name_encodes_colors(self):
+        """Match #XXXXXX,#YYYYYY at the end of the network name"""
+        return self._name[-7] == '#' and self._name[-8] == ',' \
+            and self._name[-15] == '#'
+
     def _create_palette(self):
         icon_name = get_icon_state(_ICON_NAME, self._strength)
         self._palette_icon = Icon(icon_name=icon_name,
--
cgit v0.9.1