Added.

2002-11-07  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-i18n.h: Added.

	* camel-object.h: #include camel-i18n.h instead of gnome-i18n.h

	* camel-lock.c: Same.

svn path=/trunk/; revision=18638

5 files changed, 74 insertions, 5 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 4305c2ad08..dccb142d0e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-07  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* camel-i18n.h: Added.
+
+	* camel-object.h: #include camel-i18n.h instead of gnome-i18n.h
+
+	* camel-lock.c: Same.
+
 2002-11-07  Rodrigo Moya <rodrigo@ximian.com>
 
 	* camel-object.h: removed gnome-defs.h, it does not exist.
diff --git a/camel/Makefile.am b/camel/Makefile.am
index e6e9064b73..eff6761ca2 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -146,6 +146,7 @@ libcamelinclude_HEADERS =			\
 	camel-http-stream.h			\
 	camel-index.h				\
 	camel-internet-address.h		\
+	camel-i18n.h				\
 	camel-lock.h				\
 	camel-lock-client.h			\
 	camel-medium.h				\
diff --git a/camel/camel-i18n.h b/camel/camel-i18n.h
new file mode 100644
index 0000000000..9330fe68d9
--- /dev/null
+++ b/camel/camel-i18n.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2002 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifndef __CAMEL_I18N_H__
+#define __CAMEL_I18N_H__
+
+#include <glib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#ifdef ENABLE_NLS
+#    include <libintl.h>
+#    ifdef CAMEL_EXPLICIT_TRANSLATION_DOMAIN
+#        undef _
+#        define _(String) dgettext (CAMEL_EXPLICIT_TRANSLATION_DOMAIN, String)
+#    else 
+#        define _(String) gettext (String)
+#    endif
+#    ifdef gettext_noop
+#        define N_(String) gettext_noop (String)
+#    else
+#        define N_(String) (String)
+#    endif
+#else
+/* Stubs that do something close enough.  */
+#    define textdomain(String) (String)
+#    define gettext(String) (String)
+#    define dgettext(Domain,Message) (Message)
+#    define dcgettext(Domain,Message,Type) (Message)
+#    define bindtextdomain(Domain,Directory) (Domain)
+#    define _(String) (String)
+#    define N_(String) (String)
+#endif
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __CAMEL_I18N_H__ */
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index 106d2f7824..ee613ce7be 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -50,12 +50,10 @@
 #include <sys/file.h>
 #endif
 
-#include "camel-lock.h"
-
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>  /* for _() */
 
+#include "camel-lock.h"
+#include "camel-i18n.h"
 
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
 
diff --git a/camel/camel-object.h b/camel/camel-object.h
index 7c218cd30c..785429b304 100644
--- a/camel/camel-object.h
+++ b/camel/camel-object.h
@@ -39,7 +39,7 @@ extern "C" {
 #include <camel/camel-types.h>	/* this is a @##$@#SF stupid header */
 
 /* this crap shouldn't be here */
-#include <libgnome/gnome-i18n.h>
+#include <camel/camel-i18n.h>
 
 #ifdef ENABLE_THREADS
 #include <pthread.h>