Coverity fixes

[claws.git] / src / mbox.c

diff --git a/src/mbox.c b/src/mbox.c
index 3d63009d9088658f6525f433537efe092bfd7950..6ef1cad617fdf8a512df0f1541c46c928b871550 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -128,7 +128,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
        folder_item_update_freeze();
 
        if (apply_filter)
-               dropfolder = folder_get_default_processing();
+               dropfolder = folder_get_default_processing(account->account_id);
        else
                dropfolder = dest;
        
@@ -140,7 +140,9 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
                if (msgs > 0 && msgs%500 == 0) {
                        if (printed)
                                statusbar_pop_all();
-                       statusbar_print_all(_("Importing from mbox... (%d mails imported)"), msgs);
+                       statusbar_print_all(
+                                       ngettext("Importing from mbox... (%d mail imported)",
+                                               "Importing from mbox... (%d mails imported)", msgs), msgs);
                        printed=TRUE;
                        GTK_EVENTS_FLUSH();
                }
@@ -378,6 +380,7 @@ gint lock_mbox(const gchar *base, LockType type)
 #if HAVE_FCNTL_H && !defined(G_OS_WIN32)
                if (fcntl(lockfd, F_SETLK, &fl) == -1) {
                        g_warning("can't fnctl %s (%s)", base, strerror(errno));
+                       close(lockfd);
                        return -1;
                } else {
                        fcntled = TRUE;