# HG changeset patch
# User Erik Grinaker <erikg@codepoet.no>
# Date 1138209885 0
# Node ID cace24e264c55930f85dae48d529dea8a60bc26f
# Parent  4accd78e9a8246b8161752e58e026655d97f9e8d
~ in filenames will now be expanded to homedir

diff -r 4accd78e9a8246b8161752e58e026655d97f9e8d -r cace24e264c55930f85dae48d529dea8a60bc26f ChangeLog
--- a/ChangeLog	Tue Jan 24 21:29:36 2006 +0000
+++ b/ChangeLog	Wed Jan 25 17:24:45 2006 +0000
@@ -2,6 +2,10 @@
 
 ---------------[ xxxx-xx-xx : 0.4.6 ]---------------
 
+2006-01-25  Erik Grinaker <erikg@codepoet.no>
+
+	* ~ in filenames will now be expanded to homedir
+
 2006-01-24  Erik Grinaker <erikg@codepoet.no>
 
 	* make password entry min 16px to avoid resize on icon display
diff -r 4accd78e9a8246b8161752e58e026655d97f9e8d -r cace24e264c55930f85dae48d529dea8a60bc26f NEWS
--- a/NEWS	Tue Jan 24 21:29:36 2006 +0000
+++ b/NEWS	Wed Jan 25 17:24:45 2006 +0000
@@ -14,6 +14,7 @@
 - fix crash in Password Safe import/export with fields longer than 256 chars
 - use full path when starting Revelation from applet
 - use correct key path for applet show_passwords gconf schema key
+- ~ in filenames will now be expanded to homedir
 - changed default file format for export to XML
 - changed button "Edit" to "Update" in edit entry dialog
 - remove GNOME_RevelationApplet.server during make clean
diff -r 4accd78e9a8246b8161752e58e026655d97f9e8d -r cace24e264c55930f85dae48d529dea8a60bc26f src/lib/io.py
--- a/src/lib/io.py	Tue Jan 24 21:29:36 2006 +0000
+++ b/src/lib/io.py	Wed Jan 25 17:24:45 2006 +0000
@@ -208,6 +208,7 @@
 		return None
 
 	file = re.sub("^file:/{,2}", "", file)
+	file = os.path.expanduser(file)
 
 	if not re.match("^[a-zA-Z]+://", file) and file[0] != "/":
 		file = os.path.abspath(file)
diff -r 4accd78e9a8246b8161752e58e026655d97f9e8d -r cace24e264c55930f85dae48d529dea8a60bc26f src/lib/ui.py
--- a/src/lib/ui.py	Tue Jan 24 21:29:36 2006 +0000
+++ b/src/lib/ui.py	Wed Jan 25 17:24:45 2006 +0000
@@ -653,8 +653,11 @@
 
 		try:
 			fsel = dialog.FileSelector(None, self.title, self.type)
-
-			fsel.set_filename(self.get_filename())
+			file = self.get_filename()
+
+			if file != None:
+				fsel.set_filename(file)
+
 			self.set_filename(fsel.run())
 
 		except dialog.CancelError:
@@ -664,7 +667,7 @@
 	def get_filename(self):
 		"Gets the current filename"
 
-		return self.entry.get_text()
+		return io.file_normpath(self.entry.get_text())
 
 
 	def get_text(self):