[POS-commit] Kiwi/Kiwi Views.py,1.102,1.103

[jdahlin at async.com.br]

Update of /cvs/Kiwi/Kiwi
In directory anthem:/tmp/cvs-serv25376/Kiwi

Modified Files:
	Views.py 
Log Message:
Don't override self.gladename, save it so it can be used later. When it might be needed.


Index: Views.py
===================================================================
RCS file: /cvs/Kiwi/Kiwi/Views.py,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- Views.py	24 May 2003 17:03:25 -0000	1.102
+++ Views.py	28 May 2003 01:20:07 -0000	1.103
@@ -398,12 +398,12 @@
                 "gladefile should be a string, found %s" % type(gladefile)
 
         # get base name of glade file
-        if re.match(".+\.glade$",gladefile):
-            name = string.split(gladefile,".glade")[0]
+        if re.match(".+\.glade$", gladefile):
+            filename = string.split(gladefile,".glade")[0]
         else:
-            name = gladefile
+            filename = gladefile
         
-        gladefile = find_in_gladepath(name + ".glade") 
+        gladefile = find_in_gladepath(filename + ".glade") 
         # GladeXML accepts a second parameter that allows you to specify
         # a branch of the tree. I initially thought of using
         # toplevel_name, since it would be convenient, but it causes
@@ -412,7 +412,8 @@
         # would be). This is why we use the simple, one-parameter form. 
         self.tree = libglade.GladeXML(gladefile)
         self.gladefile = gladefile
-        self.gladename = name
+        if not self.gladename:
+            self.gladename = filename
         self.widgets = widgets
    
         self._attach_widgets()