imap: Rename global var mail-storage-callbacks to imap-storage-callbacks

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 6d8dfce585bed75d574e9704ded5dda75a29507e..ddbff61a695bf34b40d4061f3654d46b7c5ee773 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -33,7 +33,7 @@
    where the time was spent. */
 #define IMAP_CLIENT_DISCONNECT_LOG_STATS_CMD_MIN_RUNNING_MSECS 1000
 
-extern struct mail_storage_callbacks mail_storage_callbacks;
+extern struct mail_storage_callbacks imap_storage_callbacks;
 extern struct imap_client_vfuncs imap_client_vfuncs;
 
 struct imap_module_register imap_module_register = { 0 };
@@ -244,7 +244,7 @@ int client_create_finish(struct client *client, const char **error_r)
        if (mail_namespaces_init(client->user, error_r) < 0)
                return -1;
        mail_namespaces_set_storage_callbacks(client->user->namespaces,
-                                             &mail_storage_callbacks, client);
+                                             &imap_storage_callbacks, client);
        client->v.init(client);
        return 0;
 }

diff --git a/src/imap/imap-storage-callbacks.c b/src/imap/imap-storage-callbacks.c
index 16c2d5110c213e552f5b082dc5b743b47d5d60c2..71bb6ce883eff015fb2ea3b6a73cc3c228181b2b 100644 (file)
--- a/src/imap/imap-storage-callbacks.c
+++ b/src/imap/imap-storage-callbacks.c
@@ -39,7 +39,7 @@ static void notify_no(struct mailbox *mailbox ATTR_UNUSED,
        } T_END;
 }
 
-struct mail_storage_callbacks mail_storage_callbacks = {
+struct mail_storage_callbacks imap_storage_callbacks = {
        notify_ok,
        notify_no
 };