( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpcore/sgpgme.c; ) > 1.9.100cvs79.patchset
( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/passphrase.c; ) > 1.9.100cvs80.patchset
( cvs diff -u -r 1.53.2.15 -r 1.53.2.16 po/POTFILES.in; cvs diff -u -r 1.274.2.80 -r 1.274.2.81 src/mainwindow.c; cvs diff -u -r 1.11.2.4 -r 1.11.2.5 src/manual.c; cvs diff -u -r 1.20.2.6 -r 1.20.2.7 src/gtk/Makefile.am; diff -u /dev/null src/gtk/icon_legend.c; diff -u /dev/null src/gtk/icon_legend.h; ) > 1.9.100cvs81.patchset
+( cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/gtk/filesel.c; ) > 1.9.100cvs82.patchset
{
GSList *slist = NULL, *slist_orig = NULL;
GList *list = NULL;
- gchar *last_selected_dir = prefs_common.attach_load_dir;
gint action = (open == TRUE) ?
(folder_mode == TRUE ? GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), filename);
free(realpath);
} else {
- if (!last_selected_dir)
- last_selected_dir = g_strdup_printf("%s%c", get_home_dir(), G_DIR_SEPARATOR);
+ if (!prefs_common.attach_load_dir)
+ prefs_common.attach_load_dir = g_strdup_printf("%s%c", get_home_dir(), G_DIR_SEPARATOR);
- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), last_selected_dir);
+ gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), prefs_common.attach_load_dir);
}
if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT)
if (slist) {
gchar *tmp = strdup(slist->data);
- if (last_selected_dir)
- g_free(last_selected_dir);
-
- if (strrchr(tmp, G_DIR_SEPARATOR))
- *(strrchr(tmp, G_DIR_SEPARATOR)+1) = '\0';
- last_selected_dir = g_strdup(tmp);
if (prefs_common.attach_load_dir)
g_free(prefs_common.attach_load_dir);
+
+ if (strrchr(tmp, G_DIR_SEPARATOR))
+ *(strrchr(tmp, G_DIR_SEPARATOR)+1) = '\0';
- prefs_common.attach_load_dir = last_selected_dir;
+ prefs_common.attach_load_dir = g_strdup(tmp);
g_free(tmp);
}