diff src/ui_pathsel.c @ 42:606fcf461a68

Sat May 14 13:04:23 2005 John Ellis <[e-mail]> * po/cs.po: Update Czech translation, submitted by Jan Raska <[e-mail]> * de.po, fr.po: Typo and spelling fixes. Sat May 14 12:23:19 2005 John Ellis <[e-mail]> * image.c, pixbuf-renderer.c: Fix sending of complete signal. * ui_pathsel.c: Guard against strcmp of NULL dd->path, fixes crash. * utilops.c: Additional validation for destination of copy/move dialogs, and do not include extension when conveniently selecting filename text in rename dialogs. ##### Note: GQview CVS on sourceforge is not always up to date, please use ##### ##### an offical release when making enhancements and translation updates. #####

--- a/src/ui_pathsel.c	Wed Apr 27 19:29:15 2005 +0000
+++ b/src/ui_pathsel.c	Sat May 14 20:58:18 2005 +0000
@@ -165,7 +165,7 @@
 	GtkListStore *store;
 	gchar *pathl;
 
-	if(!path) return;
+	if (!path) return;
 
 	pathl = path_from_utf8(path);
 	dp = opendir(pathl);
@@ -860,11 +860,11 @@
 	gchar *buf;
 
 	path = gtk_entry_get_text(GTK_ENTRY(dd->entry));
-	if (strcmp(path, dd->path) == 0) return;
+	if (dd->path && strcmp(path, dd->path) == 0) return;
 
 	buf = remove_level_from_path(path);
 
-	if (buf && strcmp(buf, dd->path) != 0)
+	if (buf && (!dd->path || strcmp(buf, dd->path) != 0))
 		{
 		gchar *tmp = remove_trailing_slash(path);
 		if (isdir(tmp))
@@ -1249,14 +1249,14 @@
 
 	path = gtk_entry_get_text(GTK_ENTRY(entry));
 	
-	if (isdir(path) && strcmp(path, dd->path) != 0)
+	if (isdir(path) && (!dd->path || strcmp(path, dd->path) != 0))
 		{
 		dest_populate(dd, path);
 		}
 	else
 		{
 		gchar *buf = remove_level_from_path(path);
-		if (isdir(buf) && strcmp(buf, dd->path) != 0)
+		if (isdir(buf) && (!dd->path || strcmp(buf, dd->path) != 0))
 			{
 			dest_populate(dd, buf);
 			}