From d9e81eafb3031c4ed5cb53ab99764f4decc6b8f6 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 11 Feb 2004 12:19:32 +0000 Subject: call the right recursive function, oops. 2004-02-11 Not Zed * importers/mail-importer.c (mail_importer_import_folders_sync): call the right recursive function, oops. * importers/mail-importer.h: don't include camel-operation.h, but fix up the forward decl usage. svn path=/trunk/; revision=24703 --- mail/ChangeLog | 8 ++++++++ mail/importers/mail-importer.c | 2 +- mail/importers/mail-importer.h | 4 +--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 100fd384b1..b596287077 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2004-02-11 Not Zed + + * importers/mail-importer.c (mail_importer_import_folders_sync): + call the right recursive function, oops. + + * importers/mail-importer.h: don't include camel-operation.h, but + fix up the forward decl usage. + 2004-02-11 JP Rosevear * importers/mail-importer.h: include camel-operation.h diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index 1aab7ac2c8..0cfeb3b56a 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -379,7 +379,7 @@ mail_importer_import_folders_sync(const char *filepath, const char *folderparent if (S_ISDIR(st.st_mode)) { foldersub = folderparent?g_strdup_printf("%s/%s", folderparent, folder):g_strdup(folder); - import_folders(filefull, foldersub, special_folders, cancel); + mail_importer_import_folders_sync(filefull, foldersub, special_folders, cancel); g_free(foldersub); } diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index b199f838ab..dfc7fcde93 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -23,8 +23,6 @@ #ifndef __MAIL_IMPORTER_H__ #define __MAIL_IMPORTER_H__ -#include - struct _MailComponent *mc; typedef struct _MailImporter MailImporter; @@ -85,6 +83,6 @@ struct _MailImporterSpecial { typedef struct _MailImporterSpecial MailImporterSpecial; /* api in flux */ -void mail_importer_import_folders_sync(const char *filepath, const char *folderparent, MailImporterSpecial special_folders[], CamelOperation *cancel); +void mail_importer_import_folders_sync(const char *filepath, const char *folderparent, MailImporterSpecial special_folders[], struct _CamelOperation *cancel); #endif -- cgit v1.2.3