changeset 16648:d2809bacb4a0

merge of '00655c64b5e1fd72a35c3884e30acf5bc9bef892' and '185797cd43f7688a6adffb29894d7da625cdfa22'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sun, 29 Apr 2007 15:16:55 +0000
parents 0bad106a6c24 (diff) b7c550dab1bc (current diff)
children 5d9f6a1f4b49 1c9835f8b29c
files pidgin/gtkrequest.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkrequest.c	Sun Apr 29 14:44:36 2007 +0000
+++ b/pidgin/gtkrequest.c	Sun Apr 29 15:16:55 2007 +0000
@@ -1550,7 +1550,8 @@
 		else
 			gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename);
 	}
-	if ((current_folder != NULL) && (*current_folder != '\0')) {
+	if ((filename == NULL || *filename == '\0' || !g_file_test(filename, G_FILE_TEST_EXISTS)) &&
+				(current_folder != NULL) && (*current_folder != '\0')) {
 		folder_set = gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filesel), current_folder);
 	}