comparison pidgin/gtkrequest.c @ 16823:c6ca9e25814b

merge of '57b4e954f5830e1dddd9bffb697deb057fb35943' and 'f547527e8c477535955c53e6a25dabe2b71bf876'
author Nathan Walp <nwalp@pidgin.im>
date Thu, 03 May 2007 14:48:29 +0000
parents 35b35ea1dce6
children fd620cbc5149
comparison
equal deleted inserted replaced
16822:a77901ef0ebb 16823:c6ca9e25814b
1545 } 1545 }
1546 1546
1547 if ((filename != NULL) && (*filename != '\0')) { 1547 if ((filename != NULL) && (*filename != '\0')) {
1548 if (savedialog) 1548 if (savedialog)
1549 gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(filesel), filename); 1549 gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(filesel), filename);
1550 else 1550 else if (g_file_test(filename, G_FILE_TEST_EXISTS))
1551 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename); 1551 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename);
1552 } 1552 }
1553 if ((filename == NULL || *filename == '\0' || !g_file_test(filename, G_FILE_TEST_EXISTS)) && 1553 if ((filename == NULL || *filename == '\0' || !g_file_test(filename, G_FILE_TEST_EXISTS)) &&
1554 (current_folder != NULL) && (*current_folder != '\0')) { 1554 (current_folder != NULL) && (*current_folder != '\0')) {
1555 folder_set = gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filesel), current_folder); 1555 folder_set = gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filesel), current_folder);