Added #include <config.h>. Marked a bunch of strings for translation.

2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>

	* camel-filter-driver.c: Added #include <config.h>. Marked
	a bunch of strings for translation.
	* camel-folder-search.c: Added #include <config.h>.
	* camel-folder-summary.c: Same here.
	* camel-movemail.c: Marked strings for translation.
	* camel-provider.c: Same here.
	* camel-search-private.c: #include <config.h>
	* camel-vee-folder.c: Mark string for translation.
	* providers/local/camel-mbox-summary.c: #include <config.h>

9 files changed, 62 insertions, 28 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 1e0a692f0..220e4dadd 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,15 @@
+2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* camel-filter-driver.c: Added #include <config.h>. Marked
+	a bunch of strings for translation.
+	* camel-folder-search.c: Added #include <config.h>.
+	* camel-folder-summary.c: Same here.
+	* camel-movemail.c: Marked strings for translation.
+	* camel-provider.c: Same here.
+	* camel-search-private.c: #include <config.h>
+	* camel-vee-folder.c: Mark string for translation.
+	* providers/local/camel-mbox-summary.c: #include <config.h>
+	
 2001-04-03  Dan Winship  <danw@ximian.com>
 
 	* providers/imap/camel-imap-folder.c (imap_sync): If we don't
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 262a9717a..2fd2a8995 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -22,6 +22,15 @@
  *  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <time.h>
+
+#include <glib.h>
+
 #include "camel-filter-driver.h"
 #include "camel-filter-search.h"
 
@@ -29,10 +38,6 @@
 #include "camel-service.h"
 #include "camel-mime-message.h"
 
-#include <glib.h>
-
-#include <time.h>
-
 #include "e-util/e-sexp.h"
 #include "e-util/e-memory.h"
 #include "e-util/e-msgport.h"	/* for edlist */
@@ -526,7 +531,7 @@ close_folder (void *key, void *value, void *data)
 	camel_folder_thaw (folder);
 	camel_object_unref (CAMEL_OBJECT (folder));
 
-	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, g_hash_table_size(p->folders)* 100 / p->closed, "Syncing folders");
+	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, g_hash_table_size(p->folders)* 100 / p->closed, _("Syncing folders"));
 }
 
 /* flush/close all folders */
@@ -535,7 +540,7 @@ close_folders (CamelFilterDriver *driver)
 {
 	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
 
-	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 0, "Syncing folders");
+	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 0, _("Syncing folders"));
 
 	p->closed = 0;
 	g_hash_table_foreach (p->folders, close_folder, driver);
@@ -635,7 +640,7 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, Ca
 	
 	fd = open (mbox, O_RDONLY);
 	if (fd == -1) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Unable to open spool folder");
+		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Unable to open spool folder"));
 		goto fail;
 	}
 	/* to get the filesize */
@@ -644,7 +649,7 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, Ca
 	mp = camel_mime_parser_new ();
 	camel_mime_parser_scan_from (mp, TRUE);
 	if (camel_mime_parser_init_with_fd (mp, fd) == -1) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Unable to process spool folder");
+		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Unable to process spool folder"));
 		goto fail;
 	}
 	fd = -1;
@@ -658,12 +663,12 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, Ca
 		if (st.st_size > 0)
 			pc = (int)(100.0 * ((double)camel_mime_parser_tell (mp) / (double)st.st_size));
 		
-		report_status (driver, CAMEL_FILTER_STATUS_START, pc, "Getting message %d (%d%%)", i, pc);
+		report_status (driver, CAMEL_FILTER_STATUS_START, pc, _("Getting message %d (%d%%)"), i, pc);
 		
 		msg = camel_mime_message_new ();
 		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Failed message %d", i);
-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, "Cannot open message");
+			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed message %d"), i);
+			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot open message"));
 			camel_object_unref (CAMEL_OBJECT (msg));
 			goto fail;
 		}
@@ -671,7 +676,7 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, Ca
 		status = camel_filter_driver_filter_message (driver, msg, NULL, NULL, NULL, source_url, ex);
 		camel_object_unref (CAMEL_OBJECT (msg));
 		if (camel_exception_is_set (ex) || status == -1) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Failed message %d", i);
+			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed message %d"), i);
 			goto fail;
 		}
 		
@@ -682,11 +687,11 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, Ca
 	}
 
 	if (p->defaultfolder) {
-		report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 100, "Syncing folder");
+		report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 100, _("Syncing folder"));
 		camel_folder_sync(p->defaultfolder, FALSE, ex);
 	}
 
-	report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Complete");
+	report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Complete"));
 	
 	return 0;
 	
@@ -740,12 +745,12 @@ camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folde
 	for (i = 0; i < uids->len; i++) {
 		int pc = (100 * i)/uids->len;
 
-		report_status (driver, CAMEL_FILTER_STATUS_START, pc, "Getting message %d of %d", i+1,
+		report_status (driver, CAMEL_FILTER_STATUS_START, pc, _("Getting message %d of %d"), i+1,
 			       uids->len);
 		
 		message = camel_folder_get_message (folder, uids->pdata[i], ex);
 		if (!message || camel_exception_is_set (ex)) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Failed at message %d of %d",
+			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed at message %d of %d"),
 				       i+1, uids->len);
 			status = -1;
 			break;
@@ -763,7 +768,7 @@ camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folde
 			camel_folder_free_message_info (folder, info);
 
 		if (camel_exception_is_set (ex) || status == -1) {
-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Failed at message %d of %d",
+			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed at message %d of %d"),
 				       i+1, uids->len);
 			status = -1;
 			break;
@@ -780,12 +785,12 @@ camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folde
 		camel_folder_free_uids (folder, uids);
 	
 	if (p->defaultfolder) {
-		report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 100, "Syncing folder");
+		report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 100, _("Syncing folder"));
 		camel_folder_sync (p->defaultfolder, FALSE, ex);
 	}
 
 	if (i == uids->len)
-		report_status (driver, CAMEL_FILTER_STATUS_END, 100, "Complete");
+		report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Complete"));
 	
 	g_free (source_url);
 	
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 7893ee13e..18f49868a 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -23,13 +23,18 @@
    It implements enough to do basic searches on folders that can provide
    an in-memory summary and a body index. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <glib.h>
 #include <sys/types.h>
 #include <regex.h>
 
+#include <glib.h>
+
 #include "camel-folder-search.h"
 #include "string-utils.h"
 
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 65de49878..69444641c 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -19,6 +19,10 @@
  *  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <ctype.h>
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
index a0873b25a..c80b8d390 100644
--- a/camel/camel-movemail.c
+++ b/camel/camel-movemail.c
@@ -582,8 +582,8 @@ camel_movemail_solaris (int sfd, int dfd, CamelException *ex)
 
 fail:
 	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-			      "Error copying "
-			      "mail temp file: %s",
+			      _("Error copying "
+			      "mail temp file: %s"),
 			      g_strerror (errno));
 
 
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index 454944584..7de7cd9a8 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -125,8 +125,8 @@ camel_provider_load (CamelSession *session, const char *path, CamelException *ex
 
 	if (!g_module_supported ()) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not load %s: Module loading "
-				      "not supported on this system.",
+				      _("Could not load %s: Module loading "
+				      "not supported on this system."),
 				      path);
 		return;
 	}
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index a6a87c072..e5adb5de0 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 /* (from glibc headers:
    POSIX says that <sys/types.h> must be included (by the caller) before <regex.h>.  */
 #include <sys/types.h>
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 5364caf9e..0d90ca06d 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -448,7 +448,7 @@ vee_get_message(CamelFolder *folder, const char *uid, CamelException *ex)
 		camel_folder_summary_info_free(folder->summary, (CamelMessageInfo *)mi);
 	} else {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     "No such message %s in %s", uid,
+				     _("No such message %s in %s"), uid,
 				     folder->name);
 	}
 
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index b8219b4c7..7a8e92a58 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -20,9 +20,9 @@
  *  USA
  */
 
-#include "camel-mbox-summary.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/stat.h>
 #include <sys/uio.h>
@@ -31,6 +31,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "camel-mbox-summary.h"
+#include "camel/camel-mime-message.h"
+#include "camel/camel-operation.h"
+
 #define io(x)
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/