libnautilus-extension: remove cusetom i18n header

Just use glib-i18n-lib.h.

6 files changed, 4 insertions, 29 deletions

diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am
index 389d637e6..caa397cde 100644
--- a/libnautilus-extension/Makefile.am
+++ b/libnautilus-extension/Makefile.am
@@ -39,7 +39,6 @@ libnautilus_extension_include_HEADERS=		\
 libnautilus_extension_la_SOURCES=			\
 	nautilus-column-provider.c                      \
 	nautilus-column.c                               \
-	nautilus-extension-i18n.h                       \
 	nautilus-extension-types.c                      \
 	nautilus-extension-private.h			\
 	nautilus-file-info.c                            \
diff --git a/libnautilus-extension/nautilus-column.c b/libnautilus-extension/nautilus-column.c
index d7db00ea8..824792528 100644
--- a/libnautilus-extension/nautilus-column.c
+++ b/libnautilus-extension/nautilus-column.c
@@ -22,9 +22,9 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include "nautilus-column.h"
-#include "nautilus-extension-i18n.h"
 
 enum {
 	PROP_0,
diff --git a/libnautilus-extension/nautilus-extension-i18n.h b/libnautilus-extension/nautilus-extension-i18n.h
deleted file mode 100644
index 97fa0ab4c..000000000
--- a/libnautilus-extension/nautilus-extension-i18n.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef NAUTILUS_EXTENSION_I18N_H
-#define NAUTILUS_EXTENSION_I18N_H
- 
-#include "config.h"
- 
-#ifdef ENABLE_NLS
-#include<libintl.h>
-#define _(String) dgettext(GETTEXT_PACKAGE,String)
-#ifdef gettext_noop
-#define N_(String) gettext_noop(String)
-#else
-#define N_(String) (String)
-#endif
-#else /* NLS is disabled */
-#define _(String) (String)
-#define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain)
-#endif
-
-#endif
diff --git a/libnautilus-extension/nautilus-menu-item.c b/libnautilus-extension/nautilus-menu-item.c
index dfe3e2712..f0c5fed48 100644
--- a/libnautilus-extension/nautilus-menu-item.c
+++ b/libnautilus-extension/nautilus-menu-item.c
@@ -22,8 +22,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
 #include "nautilus-menu.h"
-#include "nautilus-extension-i18n.h"
 
 enum {
 	ACTIVATE,
diff --git a/libnautilus-extension/nautilus-menu.c b/libnautilus-extension/nautilus-menu.c
index 73375fa77..e274af853 100644
--- a/libnautilus-extension/nautilus-menu.c
+++ b/libnautilus-extension/nautilus-menu.c
@@ -22,9 +22,9 @@
 
 #include <config.h>
 #include "nautilus-menu.h"
-#include "nautilus-extension-i18n.h"
 
 #include <glib.h>
+#include <glib/gi18n-lib.h>
 
 #define NAUTILUS_MENU_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_MENU, NautilusMenuPrivate))
 G_DEFINE_TYPE (NautilusMenu, nautilus_menu, G_TYPE_OBJECT);
diff --git a/libnautilus-extension/nautilus-property-page.c b/libnautilus-extension/nautilus-property-page.c
index d41ab997c..115194cb1 100644
--- a/libnautilus-extension/nautilus-property-page.c
+++ b/libnautilus-extension/nautilus-property-page.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #include "nautilus-property-page.h"
 
-#include "nautilus-extension-i18n.h"
+#include <glib/gi18n-lib.h>
 
 enum {
 	PROP_0,