Gentoo Archives: gentoo-commits

From: Wiktor W Brodlo <wiktor@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/anaconda:master commit in: iw/
Date: Mon, 01 Aug 2011 01:50:39
Message-Id: 73aa6573245632b27203fef2da72dcd321d767a5.wiktor@gentoo
1 commit: 73aa6573245632b27203fef2da72dcd321d767a5
2 Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
3 AuthorDate: Mon Aug 1 01:50:08 2011 +0000
4 Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
5 CommitDate: Mon Aug 1 01:50:08 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=73aa6573
7
8 iw/mirrorselect*_gui.py: pass around self.xml
9
10 ---
11 iw/mirrorselect-sync_gui.py | 2 +-
12 iw/mirrorselect_gui.py | 6 +++---
13 2 files changed, 4 insertions(+), 4 deletions(-)
14
15 diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
16 index 64c28af..9d07d53 100644
17 --- a/iw/mirrorselect-sync_gui.py
18 +++ b/iw/mirrorselect-sync_gui.py
19 @@ -69,7 +69,7 @@ class MirrorselectSyncWindow(InstallWindow):
20 mirrors_parsed = ms.parseMirrors(mirrorsf)
21 self.mirrors = ms.mirrorList(mirrors_parsed, "rsync")
22
23 - ms.addMirrors(self.mirrors, mirrors_parsed)
24 + ms.addMirrors(self.mirrors, mirrors_parsed, self.xml)
25 self.buttons = ms.buttons
26
27 return self.align
28
29 diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
30 index 2769144..417efb2 100644
31 --- a/iw/mirrorselect_gui.py
32 +++ b/iw/mirrorselect_gui.py
33 @@ -68,11 +68,11 @@ class MirrorselectWindow(InstallWindow):
34 mirrors_parsed = self.parseMirrors(mirrorsf)
35 self.mirrors = self.mirrorList(mirrors_parsed, "http+ftp")
36
37 - self.addMirrors(self.mirrors, mirrors_parsed)
38 + self.addMirrors(self.mirrors, mirrors_parsed, self.xml)
39
40 return self.align
41
42 - def addMirrors(self, mirror_list, mirror_data):
43 + def addMirrors(self, mirror_list, mirror_data, xml):
44 (regions, countries, mirrors) = mirror_list
45 self.treestore = gtk.TreeStore(gtk.Widget, str, str, str)
46 for region in regions:
47 @@ -100,7 +100,7 @@ class MirrorselectWindow(InstallWindow):
48 name_column.add_attribute(text_cell, "text", 1)
49 ipv4_column.add_attribute(text_cell, "text", 2)
50 ipv6_column.add_attribute(text_cell, "text", 3)
51 - treeview.set_search_column(1)
52 + xml.treeview.set_search_column(1)
53
54 self.xml.get_widget("mirrors_viewport").add(treeview)