From 05509c5888528399e30cc2dae7d346b34cc54220 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Thu, 25 Jan 2007 16:54:28 +0000 Subject: [PATCH] 2007-01-25 [wwp] 2.7.1cvs57 * src/gtk/filesel.c fix handling of empty value in attach_load_directory, thanks to Colin. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/filesel.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f1be0582..a7d2edd21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-25 [wwp] 2.7.1cvs57 + + * src/gtk/filesel.c + fix handling of empty value in attach_load_directory, + thanks to Colin. + 2007-01-25 [wwp] 2.7.1cvs56 * src/plugins/dillo_viewer/dillo_prefs.h diff --git a/PATCHSETS b/PATCHSETS index 195545288..77664a409 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2314,3 +2314,4 @@ ( cvs diff -u -r 1.213.2.133 -r 1.213.2.134 src/folder.c; cvs diff -u -r 1.150.2.90 -r 1.150.2.91 src/procmsg.c; cvs diff -u -r 1.60.2.40 -r 1.60.2.41 src/procmsg.h; cvs diff -u -r 1.395.2.281 -r 1.395.2.282 src/summaryview.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/common/xml.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/xml.h; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/bogofilter/bogofilter.h; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.18.2.47 -r 1.18.2.48 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.36 -r 1.23.2.37 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.7.1cvs54.patchset ( cvs diff -u -r 1.75.2.34 -r 1.75.2.35 src/matcher.c; cvs diff -u -r 1.39.2.9 -r 1.39.2.10 src/matcher.h; cvs diff -u -r 1.25.2.20 -r 1.25.2.21 src/matcher_parser_parse.y; cvs diff -u -r 1.43.2.51 -r 1.43.2.52 src/prefs_matcher.c; ) > 2.7.1cvs55.patchset ( cvs diff -u -r 1.2.4.4 -r 1.2.4.5 src/plugins/dillo_viewer/dillo_prefs.h; ) > 2.7.1cvs56.patchset +( cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/gtk/filesel.c; ) > 2.7.1cvs57.patchset diff --git a/configure.ac b/configure.ac index a6d79383c..e089c4023 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=56 +EXTRA_VERSION=57 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c index ca87f2ab8..6000a63ea 100644 --- a/src/gtk/filesel.c +++ b/src/gtk/filesel.c @@ -152,7 +152,7 @@ static GList *filesel_create(const gchar *title, const gchar *path, g_free(realpath); } else { gchar *tmp = NULL; - if (!prefs_common.attach_load_dir) + if (!prefs_common.attach_load_dir || !*prefs_common.attach_load_dir) prefs_common.attach_load_dir = g_strdup_printf("%s%c", get_home_dir(), G_DIR_SEPARATOR); if (g_utf8_validate(prefs_common.attach_load_dir, -1, NULL)) tmp = g_filename_from_utf8(prefs_common.attach_load_dir, -1, NULL, NULL, NULL); -- 2.25.1