imapc: Replace mail_debug usage with event_want_debug()

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index 3b9f45552dcb26e5b0cdbda13a2967b232ec01fd..e184ee1e1f68a983627262a67d53d30626ec441b 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -97,7 +97,7 @@ static int imapc_list_init(struct mailbox_list *_list, const char **error_r)
 
        list->set = settings_parser_get_root_set(_list->ns->user->set_parser,
                                                 imapc_get_setting_parser_info());
-       if (imapc_storage_client_create(_list->ns, list->set, _list->mail_set,
+       if (imapc_storage_client_create(_list->ns, list->set,
                                        &list->client, error_r) < 0)
                return -1;
        list->client->_list = list;

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 03ee58a7a93eb1965a1fa5fbf9ab6c9c98c6492f..88838ea36138e4820875e97f19014e29425da68e 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -308,7 +308,6 @@ static void imapc_storage_client_login(struct imapc_storage_client *client,
 
 int imapc_storage_client_create(struct mail_namespace *ns,
                                const struct imapc_settings *imapc_set,
-                               const struct mail_storage_settings *mail_set,
                                struct imapc_storage_client **client_r,
                                const char **error_r)
 {
@@ -345,7 +344,7 @@ int imapc_storage_client_create(struct mail_namespace *ns,
        set.dns_client_socket_path = *ns->user->set->base_dir == '\0' ? "" :
                t_strconcat(ns->user->set->base_dir, "/",
                            DNS_CLIENT_SOCKET_NAME, NULL);
-       set.debug = mail_set->mail_debug;
+       set.debug = event_want_debug(ns->user->event);
        set.rawlog_dir = mail_user_home_expand(ns->user,
                                               imapc_set->imapc_rawlog_dir);
        if ((imapc_set->parsed_features & IMAPC_FEATURE_SEND_ID) != 0)
@@ -447,7 +446,7 @@ imapc_storage_create(struct mail_storage *_storage,
                storage->client = imapc_list->client;
                storage->client->refcount++;
        } else {
-               if (imapc_storage_client_create(ns, storage->set, _storage->set,
+               if (imapc_storage_client_create(ns, storage->set,
                                                &storage->client, error_r) < 0)
                        return -1;
        }

diff --git a/src/lib-storage/index/imapc/imapc-storage.h b/src/lib-storage/index/imapc/imapc-storage.h
index 6624a0d1bf5b38b6a755bf53e14b0f10a2c5c387..a37fdc26536b35c15dc1648f6336a9077de029b7 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.h
+++ b/src/lib-storage/index/imapc/imapc-storage.h
@@ -200,7 +200,6 @@ struct imapc_simple_context {
 
 int imapc_storage_client_create(struct mail_namespace *ns,
                                const struct imapc_settings *imapc_set,
-                               const struct mail_storage_settings *mail_set,
                                struct imapc_storage_client **client_r,
                                const char **error_r);
 void imapc_storage_client_unref(struct imapc_storage_client **client);