From 408bde88402ac58d9835e44e0a21eeb4a8e8948b Mon Sep 17 00:00:00 2001 From: Alfons Hoogervorst Date: Fri, 11 Jan 2002 19:47:30 +0000 Subject: [PATCH 1/1] use claws' semantics for getting folder item when importing an mbox file to a folder (thanks to Dale P. Smith) --- AUTHORS | 1 + ChangeLog.claws | 7 +++++++ configure.in | 2 +- src/import.c | 10 +++++++--- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 4100ba861..508870ab4 100644 --- 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 a25d0d579..7f31348cb 100644 --- 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 529ec87ce..890d01496 100644 --- 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 bd89968fa..3b83ea1df 100644 --- 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) -- 2.25.1