* src/gtk/filesel.c

[claws.git] / src / gtk / filesel.c

diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c
index a6f089715af359af76fb824205c42d932044826e..5e5083a9c03a6c2ba68239d53aab8a81e17129dc 100644 (file)
--- a/src/gtk/filesel.c
+++ b/src/gtk/filesel.c
@@ -59,6 +59,8 @@ gchar *filesel_select_file(const gchar *title, const gchar *file)
 {
        static gchar *filename = NULL;
        static gchar *cwd = NULL;
+       gchar *startdir = NULL;
+       gchar *realfile = NULL;
 
        filesel_create(title, FALSE);
 
@@ -69,15 +71,27 @@ gchar *filesel_select_file(const gchar *title, const gchar *file)
                filename = NULL;
        }
 
-       if (!cwd)
+       /* try to extract the directory and filename from file */
+       if (file) {
+               startdir = g_dirname(file);
+               realfile = g_basename(file);
+       } else {
+               realfile = file;
+       }
+
+       /* use sylpheed's startup directory if we can't find anything useful */
+       if (!startdir || !strcmp(startdir, ".")) {
                cwd = g_strconcat(sylpheed_get_startup_dir(), G_DIR_SEPARATOR_S, NULL);
+       } else {
+               cwd = g_strconcat(startdir, G_DIR_SEPARATOR_S, NULL);
+       }
 
        gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), cwd);
 
-       if (file) {
+       if (realfile) {
                gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel),
-                                               file);
-               filesel_oldfilename = g_strdup(file);
+                                               realfile);
+               filesel_oldfilename = g_strdup(realfile);
        } else {
                filesel_oldfilename = NULL;
        }
@@ -108,6 +122,9 @@ gchar *filesel_select_file(const gchar *title, const gchar *file)
        if (filesel_oldfilename) 
                g_free(filesel_oldfilename);
 
+       if (startdir)
+               g_free(startdir);
+
        manage_window_focus_out(filesel, NULL, NULL);
        gtk_widget_destroy(filesel);
        GTK_EVENTS_FLUSH();