[Commits] [SCM] claws branch, quota-info, updated. 4.3.1-46-g97a5fdbb3

[miras at claws-mail.org]

The branch, quota-info has been updated
       via  97a5fdbb34580d976b36c074ae3bd8349394d0d9 (commit)
       via  b745060e2fd07b3b6408e8e040b58c5bc957bff3 (commit)
       via  fd46516b6b76cea257b986a0d91360786e55ce08 (commit)
      from  67c2d994640529aac9ca27755500cf3513296bb4 (commit)

Summary of changes:
 src/etpan/imap-thread.c            | 8 ++++++++
 src/etpan/imap-thread.h            | 2 ++
 src/imap.c                         | 9 +++++----
 src/plugins/archive/archiver_gtk.c | 2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 97a5fdbb34580d976b36c074ae3bd8349394d0d9
Merge: b745060e2 fd46516b6
Author: Michael Rasmussen <mir at datanom.net>
Date:   Mon Mar 10 00:29:04 2025 +0100

    Merge branch 'master' into quota-info


commit b745060e2fd07b3b6408e8e040b58c5bc957bff3
Author: Michael Rasmussen <mir at datanom.net>
Date:   Mon Mar 10 00:28:19 2025 +0100

    Working solution
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 5c07e985c..904d7f047 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -3427,6 +3427,14 @@ int imap_threaded_store(Folder * folder, struct mailimap_set * set,
 	return result.error;
 }
 
+int imap_has_quota_extension(Folder* folder) {
+	if (folder == NULL)
+		return 0;
+
+	mailimap* session = get_imap(folder);
+	return mailimap_has_extension(session, "QUOTA");
+}
+
 
 #ifndef G_OS_WIN32
 static void do_exec_command(int fd, const char * command,
diff --git a/src/etpan/imap-thread.h b/src/etpan/imap-thread.h
index 61b555287..949bde469 100644
--- a/src/etpan/imap-thread.h
+++ b/src/etpan/imap-thread.h
@@ -180,4 +180,6 @@ int imap_threaded_store(Folder * folder, struct mailimap_set * set,
 
 void imap_threaded_cancel(Folder * folder);
 
+int imap_has_quota_extension(Folder * folder);
+
 #endif
diff --git a/src/imap.c b/src/imap.c
index af5477dcf..8b0f650e3 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -3859,12 +3859,13 @@ gint imap_folder_quotaroot(Folder *folder, uint32_t *usage, uint32_t *limit)
 
 	debug_set_mode(TRUE);
 	session = imap_session_get(FOLDER(folder));
-/*
-	if (imap_has_capability(session, "QUOTA") == FALSE) {
-		debug_print("Missing 'QUOTA'\n");
+
+	if (!imap_has_quota_extension(FOLDER(folder))) {
+		debug_print("%s: Does not support the QUOTA extension\n",
+				FOLDER(folder)->name);
 		return MAILIMAP_ERROR_CAPABILITY;
 	}
-*/
+
 	result = imap_threaded_quotaroot(session->folder, &quota_data);
 
 	if (result != MAILIMAP_NO_ERROR) {

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


hooks/post-receive
-- 
Claws Mail