[Commits] [SCM] claws branch, gtk2, updated. 3.20.0-86-ga1d4f569c

[paul at claws-mail.org]

The branch, gtk2 has been updated
       via  a1d4f569cbf0738abd267eb794819aac426567c4 (commit)
      from  9007c1fe3b3b46ebe4dc93ac2427d49f8f04ab19 (commit)

Summary of changes:
 src/export.c |  6 +++---
 src/import.c | 20 ++++++--------------
 2 files changed, 9 insertions(+), 17 deletions(-)


- Log -----------------------------------------------------------------
commit a1d4f569cbf0738abd267eb794819aac426567c4
Author: Paul <paul at claws-mail.org>
Date:   Mon May 13 10:53:46 2024 +0100

    when importing mbox don't suggest 'Inbox' if destination missing; standardise label on export error

diff --git a/src/export.c b/src/export.c
index d096fd5a3..4b350af38 100644
--- a/src/export.c
+++ b/src/export.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -202,7 +202,7 @@ static void export_ok_cb(GtkWidget *widget, gpointer data)
 	utf8mbox = gtk_entry_get_text(GTK_ENTRY(file_entry));
 
 	if (!utf8mbox || !*utf8mbox) {
-		alertpanel_error(_("Target mbox filename can't be left empty."));
+		alertpanel_error(_("Mbox file can't be left empty."));
 		gtk_widget_grab_focus(file_entry);
 		return;
 	}
diff --git a/src/import.c b/src/import.c
index cc6224e33..a5a116207 100644
--- a/src/import.c
+++ b/src/import.c
@@ -204,18 +204,14 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
 	cm_return_if_fail(destdir);
 
 	if (!*utf8mbox) {
-		alertpanel_error(_("Source mbox filename can't be left empty."));
+		alertpanel_error(_("Mbox file can't be left empty."));
 		gtk_widget_grab_focus(file_entry);
 		return;
 	}
-	if (destdir && !*destdir) {
-		if (alertpanel(_("Import mbox file"),
-						_("Destination folder is not set.\nImport mbox file to the Inbox folder?"),
-						GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL, ALERTFOCUS_FIRST)
-			== G_ALERTALTERNATE) {
-			gtk_widget_grab_focus(dest_entry);
-			return;
-		}
+	if (!*destdir) {
+		alertpanel_error(_("Destination folder can't be left empty."));
+		gtk_widget_grab_focus(dest_entry);
+		return;
 	}
 
 	mbox = g_filename_from_utf8(utf8mbox, -1, NULL, NULL, NULL);
@@ -224,11 +220,7 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
 		mbox = g_strdup(utf8mbox);
 	}
 
-	if (!*destdir) {
-		dest = folder_find_item_from_path(INBOX_DIR);
-	} else {
-		dest = folder_find_item_from_identifier(destdir);
-	}
+	dest = folder_find_item_from_identifier(destdir);
 
 	if (!dest) {
 		alertpanel_error(_("Can't find the destination folder."));

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail