gyrus r333 - in branches/gyrus-python: . src

[csaavedra svn gnome org]

Author: csaavedra
Date: Thu Mar  6 19:46:12 2008
New Revision: 333
URL: http://svn.gnome.org/viewvc/gyrus?rev=333&view=rev

Log:
2008-03-06  Claudio Saavedra  <csaavedra alumnos utalca cl>

	* src/gyrus.py:
	* src/gyrus_constant.py:
	* src/gyrus_find.py:
	* src/gyrus_session.py:

	Build paths appropriately, using os.path.join instead of simply
	concatenating directores and filenames.



Modified:
   branches/gyrus-python/ChangeLog
   branches/gyrus-python/src/gyrus.py
   branches/gyrus-python/src/gyrus_constant.py
   branches/gyrus-python/src/gyrus_find.py
   branches/gyrus-python/src/gyrus_session.py

Modified: branches/gyrus-python/src/gyrus.py
==============================================================================
--- branches/gyrus-python/src/gyrus.py	(original)
+++ branches/gyrus-python/src/gyrus.py	Thu Mar  6 19:46:12 2008
@@ -468,7 +468,7 @@
 
 
 	def load_table_page (self):
-		glade_file = gtk.glade.XML (DIRGYRUS + "glade/page.glade","table_page",None)
+		glade_file = gtk.glade.XML (os.path.join (DIRGYRUS, "glade", "page.glade"),"table_page",None)
 
 		admin = GyrusAdmin()
 
@@ -625,7 +625,7 @@
 
 
 	def load_dialog_password (self):
-		glade_file = gtk.glade.XML (DIRGYRUS + "glade/page.glade","dialog_password",None)
+		glade_file = gtk.glade.XML (os.path.join (DIRGYRUS, "glade", "page.glade"),"dialog_password",None)
 
 		dialog_password = glade_file.get_widget ("dialog_password")
 		entry_password = glade_file.get_widget ("entry_password")
@@ -690,7 +690,7 @@
 
 
 	def load_dialog_edit_mailbox (self,admin):
-		glade_file = gtk.glade.XML (DIRGYRUS + "glade/create_mailbox.glade",None,None)
+		glade_file = gtk.glade.XML (os.path.join (DIRGYRUS, "glade", "create_mailbox.glade"),None,None)
 
 		dialog = glade_file.get_widget ("dialog_create_mailbox")
 		checkbutton_quota = glade_file.get_widget ("checkbutton_quota")

Modified: branches/gyrus-python/src/gyrus_constant.py
==============================================================================
--- branches/gyrus-python/src/gyrus_constant.py	(original)
+++ branches/gyrus-python/src/gyrus_constant.py	Thu Mar  6 19:46:12 2008
@@ -3,12 +3,12 @@
 
 PREFIX = abspath(join(dirname(__file__), pardir))
 
-DIRSHARE = PREFIX + "/share/gyrus/"
+DIRSHARE = join (PREFIX, "share", "gyrus")
 DIRGYRUS = DIRSHARE
-DIRLOCALE = PREFIX + "/share/locale/"
+DIRLOCALE = join (PREFIX, "share", "locale")
 
 if not os.path.exists(DIRSHARE):
-	DIRGYRUS = os.path.abspath(os.curdir) + "/"
+	DIRGYRUS = os.path.abspath(os.curdir)
 	DIRLOCALE = join(os.path.abspath(os.curdir),'locale')
 
 APPNAME ="gyrus"
@@ -55,7 +55,7 @@
 PATH_KEY =  "/apps/gyrus/"
 PATH_SESSIONS = "/apps/gyrus/sessions/"
 
-LOGO = DIRGYRUS + "images/gyrus.png"
+LOGO = join (DIRGYRUS, "images", "gyrus.png")
 
 UI = '''<ui>
   <menubar name="MainMenu">

Modified: branches/gyrus-python/src/gyrus_find.py
==============================================================================
--- branches/gyrus-python/src/gyrus_find.py	(original)
+++ branches/gyrus-python/src/gyrus_find.py	Thu Mar  6 19:46:12 2008
@@ -17,7 +17,7 @@
 
 
 def load_page_find (self):
-	glade_file = gtk.glade.XML (DIRGYRUS + "glade/find.glade",None,None)
+	glade_file = gtk.glade.XML (os.path.join (DIRGYRUS,"glade","find.glade"),None,None)
 
 	self.dialog_find = glade_file.get_widget ("dialog_find")
 	self.comboboxentry_mailbox = glade_file.get_widget ("comboboxentry_mailbox")

Modified: branches/gyrus-python/src/gyrus_session.py
==============================================================================
--- branches/gyrus-python/src/gyrus_session.py	(original)
+++ branches/gyrus-python/src/gyrus_session.py	Thu Mar  6 19:46:12 2008
@@ -28,7 +28,7 @@
 		
 
 def load_interface (widget,self):
-	glade_file = gtk.glade.XML (DIRGYRUS + "glade/sessions.glade","dialog_sessions",None)
+	glade_file = gtk.glade.XML (os.path.join (DIRGYRUS, "glade", "sessions.glade"),"dialog_sessions",None)
 
 	self.window_dialog = glade_file.get_widget ("dialog_sessions")
 	self.treeview_sessions = glade_file.get_widget ("treeview_sessions")
@@ -56,7 +56,7 @@
 	col.add_attribute (cell,"text",COLUMN_NAME)
 
 def load_interface_edit_session(self):
-	glade_file = gtk.glade.XML (DIRGYRUS + "glade/sessions.glade","dialog_session_edit",None)
+	glade_file = gtk.glade.XML (os.path.join (DIRGYRUS, "glade", "sessions.glade"),"dialog_session_edit",None)
 
 	self.window_dialog_session_edit = glade_file.get_widget ("dialog_session_edit")
 	self.checkbutton_secure = glade_file.get_widget ("checkbutton_secure")