use claws' semantics for getting folder item when importing an mbox file to a folder...

diff --git a/AUTHORS b/AUTHORS
index 4100ba861acec26c12d5a7880defc3f7661da8ca..508870ab4718b73fe0a5433f5598ca6eadd9ce66 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -104,3 +104,4 @@ contributors (beside the above; based on Changelog)
        Fredrik Olofsen
        Gustavo Noronha Silva
        Simon 'corecode' Schubert
+       Dale P. Smith

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a25d0d579b01a528e75452cfd7dce42c559e1236..7f31348cb8b5c99eb64decc9e453cdefae621102 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-01-11 [alfons]    0.6.6claws50
+
+       * src/import.c
+               use claws' semantics for getting folder item when
+               importing an mbox file into a folder 
+               (submitted by Dale P. Smith)
+
 2002-01-11 [christoph] 0.6.6claws49
 
        * src/prefs.h

diff --git a/configure.in b/configure.in
index 529ec87cedb51fd0726c64f67e75c7defd0bf2ce..890d014969d1eeab492c0cc11876b17f4b2b58bf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws48
+EXTRA_VERSION=claws50
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/import.c b/src/import.c
index bd89968fad32326af93a192778dbbd0e17d9efcd..3b83ea1dff1a87512cecf3020d0aa30fbae10c7a 100644 (file)
--- a/src/import.c
+++ b/src/import.c
@@ -95,7 +95,7 @@ gint import_mbox(FolderItem *default_dest)
                        if (!destdir || !*destdir) {
                                dest = folder_find_item_from_path(INBOX_DIR);
                        } else
-                               dest = folder_find_item_from_path(destdir);
+                               dest = folder_find_item_from_identifier(destdir);
 
                        if (!dest) {
                                g_warning("Can't find the folder.\n");
@@ -226,10 +226,14 @@ static void import_filesel_cb(GtkWidget *widget, gpointer data)
 static void import_destsel_cb(GtkWidget *widget, gpointer data)
 {
        FolderItem *dest;
+       gchar *path;
 
        dest = foldersel_folder_sel(NULL, NULL);
-       if (dest && dest->path)
-               gtk_entry_set_text(GTK_ENTRY(dest_entry), dest->path);
+       if (!dest)
+                return;
+       path = folder_item_get_identifier(dest);
+       gtk_entry_set_text(GTK_ENTRY(dest_entry), path);
+       g_free(path);
 }
 
 static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)