2004-11-13 [paul] 0.9.12cvs146.8

	* src/folder.c
	* src/procmime.c
		fix 2 bugs introduced in last commit

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d50d324c89aec2ee5ae682963df2fb3707219093..948c7521f3fab02ccb065ec19fa529160228c8fd 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-11-13 [paul]      0.9.12cvs146.8
+
+       * src/folder.c
+       * src/procmime.c
+               fix 2 bugs introduced in last commit
+
 2004-11-13 [paul]      0.9.12cvs146.7
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index cb6163b24ed7249e94706fe7424701e16ca2a91d..14979659b923cff98423e26f7937035db8aabd62 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -232,3 +232,4 @@
 ( cvs diff -u -r 1.96.2.33 -r 1.96.2.34 src/textview.c; ) > 0.9.12cvs146.5.patchset
 ( cvs diff -u -r 1.382.2.62 -r 1.382.2.63 src/compose.c; cvs diff -u -r 1.179.2.12 -r 1.179.2.13 src/imap.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/matcher_parser.h; cvs diff -u -r 1.25.2.5 -r 1.25.2.6 src/matcher_parser_parse.y; cvs diff -u -r 1.59.2.8 -r 1.59.2.9 src/prefs_filtering.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/prefs_filtering_action.c; cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/prefs_themes.c; cvs diff -u -r 1.30.2.5 -r 1.30.2.6 src/prefs_toolbar.c; cvs diff -u -r 1.36.2.14 -r 1.36.2.15 src/common/utils.c; ) > 0.9.12cvs146.6.patchset
 ( cvs diff -u -r 1.382.2.63 -r 1.382.2.64 src/compose.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/exporthtml.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/exportldif.c; cvs diff -u -r 1.213.2.20 -r 1.213.2.21 src/folder.c; cvs diff -u -r 1.179.2.13 -r 1.179.2.14 src/imap.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/imap_gtk.c; cvs diff -u -r 1.115.2.22 -r 1.115.2.23 src/main.c; cvs diff -u -r 1.274.2.23 -r 1.274.2.24 src/mainwindow.c; cvs diff -u -r 1.94.2.32 -r 1.94.2.33 src/messageview.c; cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/mh_gtk.c; cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/prefs_themes.c; cvs diff -u -r 1.49.2.19 -r 1.49.2.20 src/procmime.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/setup.c; cvs diff -u -r 1.395.2.39 -r 1.395.2.40 src/summaryview.c; ) > 0.9.12cvs146.7.patchset
+( cvs diff -u -r 1.213.2.21 -r 1.213.2.22 src/folder.c; cvs diff -u -r 1.49.2.20 -r 1.49.2.21 src/procmime.c; ) > 0.9.12cvs146.8.patchset

diff --git a/configure.ac b/configure.ac
index a9f183b97286e9cb7958107aa1cdaa5d17c63b16..121e5a57f7008b10c17d7a047216e2158a30ab87 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=146
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.7
+EXTRA_GTK2_VERSION=.8
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/folder.c b/src/folder.c
index 0c6bae35084ca74b6c1f933652cbc85dfdddc745..46d1b7e45695883b7e97360117be661bfa9b15a8 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1062,11 +1062,14 @@ FolderItem *folder_find_child_item_by_name(FolderItem *item, const gchar *name)
        FolderItem *child;
 
        for (node = item->node->children; node != NULL; node = node->next) {
+               gchar *base;
                child = FOLDER_ITEM(node->data);
-               if (strcmp2(g_path_get_basename(child->path), name) == 0) {
-                       g_free(child->path);
+               base = g_path_get_basename(child->path);
+               if (strcmp2(base, name) == 0) {
+                       g_free(base);
                        return child;
                }
+               g_free(base);
        }
 
        return NULL;

diff --git a/src/procmime.c b/src/procmime.c
index 6029e4409d9852566ed77c0b8fe30ecfd693e6ec..b9b49b8ca047c32694d7fd0e1ac78bfbe0fbeb45 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -814,22 +814,23 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
                base = "mimetmp.html";
        else {
                const gchar *basetmp;
+               gchar *basename;
 
                basetmp = procmime_mimeinfo_get_parameter(mimeinfo, "filename");
                if (basetmp == NULL)
                        basetmp = procmime_mimeinfo_get_parameter(mimeinfo, "name");
                if (basetmp == NULL)
                        basetmp = "mimetmp";
-               base = g_path_get_basename(basetmp);
+               basename = g_path_get_basename(basetmp);
                if (*base == '\0') base = "mimetmp";
-               Xstrdup_a(base, base, {g_free(base); return NULL;});
+               Xstrdup_a(base, basename, {g_free(basename); return NULL;});
                subst_for_shellsafe_filename(base);
+               g_free(basename);
        }
 
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
                               f_prefix, base, NULL);
 
-       g_free(base);
        return filename;
 }