[libexif-cvs] libmnote/libmnote/olympus Makefile.am,1.2,1.3 mnote-olympus-entry.c,1.2,1.3 mnote-olympus-tag.c,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libmnote/libmnote/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv20519/libmnote/olympus

Modified Files:
	Makefile.am mnote-olympus-entry.c mnote-olympus-tag.c 
Log Message:
i18n factorization

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	15 Nov 2002 19:54:49 -0000	1.2
+++ Makefile.am	3 Dec 2002 09:04:32 -0000	1.3
@@ -1,7 +1,8 @@
 INCLUDES =						\
 	-DLIBMNOTE_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir)					\
-        -I$(top_srcdir)/intl				\
+	-I$(top_srcdir)/intl				\
+	-I$(top_srcdir)/libmnote			\
 	$(LIBEXIF_CFLAGS)
 
 noinst_LTLIBRARIES = libmnote-olympus.la

Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-entry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-olympus-entry.c	29 Nov 2002 16:12:44 -0000	1.2
+++ mnote-olympus-entry.c	3 Dec 2002 09:04:33 -0000	1.3
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "i18n.h"
 #include "mnote-olympus-entry.h"
 
 #include <stdio.h>
@@ -27,25 +28,6 @@
 
 #include <libexif/exif-format.h>
 #include <libexif/exif-utils.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  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
 
 struct _MNoteOlympusEntryPrivate {
 	unsigned int ref_count;

Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-olympus-tag.c	29 Nov 2002 16:12:44 -0000	1.2
+++ mnote-olympus-tag.c	3 Dec 2002 09:04:33 -0000	1.3
@@ -19,29 +19,11 @@
  */
 
 #include "config.h"
+#include "i18n.h"
 #include "mnote-olympus-tag.h"
 
 #include <stdlib.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  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
-
 static struct {
 	MNoteOlympusTag tag;
 	const char *name;
@@ -83,7 +65,7 @@
 
 	unsigned int i;
 
-	bindtextdomain (PACKAGE, LIBMNOTE_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
 
 	for (i = 0; table[i].title; i++)
 		if (table[i].tag == tag)
@@ -99,7 +81,7 @@
 
 	unsigned int i;
 
-	bindtextdomain (PACKAGE, LIBMNOTE_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
 
 	for (i = 0; table[i].description; i++)
 		if (table[i].tag == tag)