dwindows: gtk/dw.c comparison

Fix for file and folder not being selected on GTK if file does not exist.

comparison

equal deleted inserted replaced

-:66d4e16349e0
+:9c8de9cccc07
 else if(flags == DW_FILE_OPEN)
 gtk_file_chooser_select_filename( GTK_FILE_CHOOSER( filew), mypath );
 }
 else if(flags == DW_FILE_SAVE)
 {
-/* If it doesn't exist... Try it as a file for now...
+if(strchr(mypath, '/'))
-* May need to separate it into folder and file.
+{
-*/
+unsigned long x = strlen(mypath) - 1;
-gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( filew ), mypath );
+/* Trim off the filename */
+while(x > 0 && mypath[x] != '/')
+{
+x--;
+}
+if(mypath[x] == '/')
+{
+char *file = NULL;
+char temp[PATH_MAX+1];
+/* Save the original path in temp */
+strcpy(temp, mypath);
+mypath[x] = 0;
+/* Check to make sure the trimmed piece is a directory */
+if(realpath(mypath, temp) && stat(temp, &buf) == 0)
+{
+if(buf.st_mode & S_IFDIR)
+{
+/* We now have it split */
+file = &mypath[x+1];
+}
+}
+/* Select folder... */
+gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(filew), temp );
+/* ... and file separately */
+if(file)
+gtk_file_chooser_set_current_name( GTK_FILE_CHOOSER(filew), file );
+}
+}
 }
 }
 if ( gtk_dialog_run( GTK_DIALOG( filew ) ) == GTK_RESPONSE_ACCEPT )
 {

Mercurial > dwindows