make destin folder in import mbox dialog have the correct folder identifier

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1a4f40ed5d12ced9cdb0047a40d9560f06addc8e..9f41ebcbcf69080c082a692b829ba8511743702b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-01-26 [alfons]    0.7.0claws31
+
+       * src/import.c
+               let import dialog show the destination folder identifier
+

 2002-01-26 [melvin]    0.7.0claws30
 
        * src/folderview.c
 2002-01-26 [melvin]    0.7.0claws30
 
        * src/folderview.c

diff --git a/configure.in b/configure.in
index e9e5b977e377ba50d32edad030dc8f9e6ab36d18..36555b4adf89d7ef7226940d59352bc94028fef7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws30
+EXTRA_VERSION=claws31

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/import.c b/src/import.c
index 3b83ea1dff1a87512cecf3020d0aa30fbae10c7a..549c0c4da33971f1bb3ffae1a7e86b118f50f84a 100644 (file)
--- a/src/import.c
+++ b/src/import.c
@@ -68,6 +68,7 @@ static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
 gint import_mbox(FolderItem *default_dest)
 {
        gint ok = 0;
 gint import_mbox(FolderItem *default_dest)
 {
        gint ok = 0;

+       gchar *path;

 
        if (!window)
                import_create();
 
        if (!window)
                import_create();


@@ -75,8 +76,12 @@ gint import_mbox(FolderItem *default_dest)
                gtk_widget_show(window);
 
        gtk_entry_set_text(GTK_ENTRY(file_entry), "");
                gtk_widget_show(window);
 
        gtk_entry_set_text(GTK_ENTRY(file_entry), "");

-       if (default_dest && default_dest->path)
-               gtk_entry_set_text(GTK_ENTRY(dest_entry), default_dest->path);
+
+       if (default_dest) { 
+               path = folder_item_get_identifier(default_dest);
+               gtk_entry_set_text(GTK_ENTRY(dest_entry), path);
+               g_free(path);
+       }       

        else
                gtk_entry_set_text(GTK_ENTRY(dest_entry), "");
        gtk_widget_grab_focus(file_entry);
        else
                gtk_entry_set_text(GTK_ENTRY(dest_entry), "");
        gtk_widget_grab_focus(file_entry);