From fe962a2055234adf407999f0557ae25441ca5c35 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Thu, 29 Mar 2001 20:31:40 +0000 Subject: Big header cleanups and nntp compile fix svn path=/trunk/; revision=9024 --- camel/providers/local/camel-local-folder.c | 2 ++ camel/providers/local/camel-local-provider.c | 5 ++++- camel/providers/local/camel-local-store.c | 3 ++- camel/providers/local/camel-local-summary.c | 11 +++++++---- camel/providers/local/camel-maildir-folder.c | 2 ++ camel/providers/local/camel-maildir-store.c | 2 ++ camel/providers/local/camel-maildir-summary.c | 12 ++++++++---- camel/providers/local/camel-mbox-folder.c | 4 +++- camel/providers/local/camel-mbox-store.c | 2 ++ camel/providers/local/camel-mbox-summary.c | 4 ++++ camel/providers/local/camel-mh-folder.c | 2 ++ camel/providers/local/camel-mh-store.c | 2 ++ camel/providers/local/camel-mh-summary.c | 10 +++++++--- 13 files changed, 47 insertions(+), 14 deletions(-) (limited to 'camel/providers/local') diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c index ea2894aa2e..205606fc90 100644 --- a/camel/providers/local/camel-local-folder.c +++ b/camel/providers/local/camel-local-folder.c @@ -20,7 +20,9 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c index 59c2982ace..a63ff84eb0 100644 --- a/camel/providers/local/camel-local-provider.c +++ b/camel/providers/local/camel-local-provider.c @@ -20,9 +20,12 @@ * USA */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include -#include "config.h" #include "camel-provider.h" #include "camel-session.h" #include "camel-url.h" diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c index 34da035301..d0ce48ce98 100644 --- a/camel/providers/local/camel-local-store.c +++ b/camel/providers/local/camel-local-store.c @@ -20,8 +20,9 @@ * USA */ - +#ifdef HAVE_CONFIG_H #include +#endif #include #include diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c index 869b7c712a..8f785afe15 100644 --- a/camel/providers/local/camel-local-summary.c +++ b/camel/providers/local/camel-local-summary.c @@ -20,11 +20,11 @@ * USA */ -#include "camel-local-summary.h" -#include +#ifdef HAVE_CONFIG_H +#include +#endif #include - #include #include #include @@ -32,6 +32,9 @@ #include #include +#include "camel-local-summary.h" +#include + #define io(x) #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ @@ -398,7 +401,7 @@ local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMess camel_folder_change_info_add_uid(ci, camel_message_info_uid(mi)); } else { d(printf("Failed!\n")); - camel_exception_set(ex, 1, "Unable to add message to summary: unknown reason"); + camel_exception_set(ex, 1, _("Unable to add message to summary: unknown reason")); } return mi; } diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c index c4d347d083..198e4ebc00 100644 --- a/camel/providers/local/camel-maildir-folder.c +++ b/camel/providers/local/camel-maildir-folder.c @@ -20,7 +20,9 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c index d419095ea0..8fa4454485 100644 --- a/camel/providers/local/camel-maildir-store.c +++ b/camel/providers/local/camel-maildir-store.c @@ -20,7 +20,9 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c index 29310e9115..e2ce0f4e97 100644 --- a/camel/providers/local/camel-maildir-summary.c +++ b/camel/providers/local/camel-maildir-summary.c @@ -18,8 +18,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "camel-maildir-summary.h" -#include +#ifdef HAVE_CONFIG_H +#include +#endif #include #include @@ -33,6 +34,9 @@ #include +#include "camel-maildir-summary.h" +#include + #include "camel-private.h" #include "e-util/e-memory.h" @@ -398,7 +402,7 @@ static int maildir_summary_load(CamelLocalSummary *cls, int forceindex, CamelExc dir = opendir(cur); if (dir == NULL) { - camel_exception_setv(ex, 1, "Cannot open maildir directory path: %s: %s", cls->folder_path, strerror(errno)); + camel_exception_setv(ex, 1, _("Cannot open maildir directory path: %s: %s"), cls->folder_path, strerror(errno)); g_free(cur); return -1; } @@ -519,7 +523,7 @@ maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Ca no longer exist */ dir = opendir(cur); if (dir == NULL) { - camel_exception_setv(ex, 1, "Cannot open maildir directory path: %s: %s", cls->folder_path, strerror(errno)); + camel_exception_setv(ex, 1, _("Cannot open maildir directory path: %s: %s"), cls->folder_path, strerror(errno)); g_free(cur); g_free(new); return -1; diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c index 14dca0049e..9db90fb40c 100644 --- a/camel/providers/local/camel-mbox-folder.c +++ b/camel/providers/local/camel-mbox-folder.c @@ -20,7 +20,9 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include @@ -147,7 +149,7 @@ static int mbox_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *e mf->lockfd = open(lf->folder_path, O_RDWR, 0); if (mf->lockfd == -1) { - camel_exception_setv(ex, 1, "Cannot create folder lock on %s: %s", lf->folder_path, strerror(errno)); + camel_exception_setv(ex, 1, _("Cannot create folder lock on %s: %s"), lf->folder_path, strerror(errno)); return -1; } diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c index c6ddc7ce0a..712c7fde37 100644 --- a/camel/providers/local/camel-mbox-store.c +++ b/camel/providers/local/camel-mbox-store.c @@ -20,7 +20,9 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c index b8219b4c78..a37d1633ff 100644 --- a/camel/providers/local/camel-mbox-summary.c +++ b/camel/providers/local/camel-mbox-summary.c @@ -20,6 +20,10 @@ * USA */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "camel-mbox-summary.h" #include "camel/camel-mime-message.h" #include "camel/camel-operation.h" diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c index fec620edea..cdf636b533 100644 --- a/camel/providers/local/camel-mh-folder.c +++ b/camel/providers/local/camel-mh-folder.c @@ -20,7 +20,9 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c index a488a71c12..3edadb5ca1 100644 --- a/camel/providers/local/camel-mh-store.c +++ b/camel/providers/local/camel-mh-store.c @@ -20,7 +20,9 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif #include #include diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c index c933626653..3e588be909 100644 --- a/camel/providers/local/camel-mh-summary.c +++ b/camel/providers/local/camel-mh-summary.c @@ -18,8 +18,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "camel-mh-summary.h" -#include +#ifdef HAVE_CONFIG_H +#include +#endif #include #include @@ -33,6 +34,9 @@ #include +#include "camel-mh-summary.h" +#include + #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ #define CAMEL_MH_SUMMARY_VERSION (0x2000) @@ -211,7 +215,7 @@ mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, Came no longer exist */ dir = opendir(cls->folder_path); if (dir == NULL) { - camel_exception_setv(ex, 1, "Cannot open MH directory path: %s: %s", cls->folder_path, strerror(errno)); + camel_exception_setv(ex, 1, _("Cannot open MH directory path: %s: %s"), cls->folder_path, strerror(errno)); return -1; } -- cgit v1.2.3