The unified diff between revisions [4c238e6f..] and [875f109b..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "interapplet.py"
# from [2b1eea9ef9bf60dde04a6af6eb39406e93fe5c38]
# to [9544599caa57f2b5853b7faa0b4b69feff12e0c6]
#
============================================================
--- interapplet.py 2b1eea9ef9bf60dde04a6af6eb39406e93fe5c38
+++ interapplet.py 9544599caa57f2b5853b7faa0b4b69feff12e0c6
@@ -53,7 +53,6 @@ class InterfaceInfo:
class InterfaceInfo:
def __init__(self, file):
- self.maps = {}
self.dialups = set()
self.interfaces = set()
self.mappings = set()
@@ -74,31 +73,18 @@ class InterfaceInfo:
auto = re.compile(r'^\s?auto[\s^]')
iface = re.compile(r'^\s?iface\s+([\w_]+)\s+([\w_]+)\s+([\w_]+)')
-
- current_mapping = None
-
for line in fd:
m = mapping.match(line)
if m:
- current_mapping = m.groups()[0]
- self.mappings.add(current_mapping)
- self.maps[current_mapping] = []
- if current_mapping:
- m = map.match(line)
- if m: self.maps[current_mapping].append(m.groups())
+ self.mappings.add(m.groups()[0])
m = iface.match(line)
if m:
- current_mapping = None
name, family, method = m.groups()
if method == "loopback": continue
elif method == "ppp" or method == "wvdial":
self.dialups.add(name)
else:
self.interfaces.add(name)
- m = auto.match(line)
- if m:
- current_mapping = None
- continue
class InterfaceState:
def __init__(self, file):
@@ -301,7 +287,6 @@ class InterfaceApplet(gnomeapplet.Applet
self.enable_interface(apply_to, params[0])
def build_mapping_menu(self, mapping):
menu = gtk.Menu()
- explicit = map(lambda x: x[0], self.if_info.maps.get(mapping, []))
interfaces = list(self.if_info.interfaces)
interfaces.sort()
group = None