* src/folderview.c

	fix bug #472, "filter not updated when renaming folder"

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2f0c83bf501d75bb650be7d47b2be5bdd630703e..858d9b4f41c715f1f30d5fc526f565d221ef09b2 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-04-06 [alfons]    0.9.10claws41
+
+       * src/folderview.c
+               fix bug #472, "filter not updated when renaming folder" 
+
 2004-04-06 [alfons]    0.9.10claws40
 
        * src/messageview.[ch]

diff --git a/configure.ac b/configure.ac
index 62d752cc5d8e0782dd63f9fd49e74e1798db4135..c4b68bdbace18fe32a308be4aca5b9131fd1e217 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/folderview.c b/src/folderview.c
index 08bd4249c63dadfb9a8a257675aa95ec2a81f37d..61003fdd2b808990af9edd95e84e56badeb46239 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2107,13 +2107,15 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
 
        Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
 
+       old_id = folder_item_get_identifier(item);
+       
        if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
                alertpanel_error(_("The folder could not be renamed.\n"
                                   "The new folder name is not allowed."));
+               g_free(old_id);
                return;
        }
 
-       old_id = folder_item_get_identifier(item);
        /* if (FOLDER_TYPE(item->folder) == F_MH)
                prefs_filtering_rename_path(old_path, item->path); */
        new_id = folder_item_get_identifier(item);