From 565585429192250c2c709337af73a38820895a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Sat, 19 Feb 2005 13:11:51 +0000
Subject: **BUGFIX** Bind to right text domain. This fixes missing translations
 for prefixes different from /usr.

CVS patchset: 7418
CVS date: 2005/02/19 13:11:51
---
 src/xine-engine/xine.c        |  4 +--
 src/xine-engine/xineintl.h    | 57 +++++++++++++++++++++++++++++++++++++++++++
 src/xine-engine/xineintl.h.in | 57 -------------------------------------------
 3 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 src/xine-engine/xineintl.h
 delete mode 100644 src/xine-engine/xineintl.h.in

(limited to 'src')

diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 8e7975727..0ac89b2c7 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine.c,v 1.310 2005/02/13 22:12:50 holstsn Exp $
+ * $Id: xine.c,v 1.311 2005/02/19 13:11:52 valtri Exp $
  */
 
 /*
@@ -1360,7 +1360,7 @@ xine_t *xine_new (void) {
    * i18n
    */
 
-  bindtextdomain("xine-lib", XINE_LOCALEDIR);
+  bindtextdomain(XINE_TEXTDOMAIN, XINE_LOCALEDIR);
 #endif
 
   /*
diff --git a/src/xine-engine/xineintl.h b/src/xine-engine/xineintl.h
new file mode 100644
index 000000000..614195193
--- /dev/null
+++ b/src/xine-engine/xineintl.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2000-2005 the xine project
+ * 
+ * This file is part of xine, a free video player.
+ * 
+ * xine 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.
+ * 
+ * xine 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 Place - Suite 330, Boston, MA  02111-1307, USA
+ *
+ * $Id: xineintl.h,v 1.9 2005/02/19 13:11:53 valtri Exp $
+ *
+ */
+
+#ifndef HAVE_XINEINTL_H
+#define HAVE_XINEINTL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <locale.h>
+
+#ifdef ENABLE_NLS
+#    include <libintl.h>
+#    define _(String) dgettext (XINE_TEXTDOMAIN, String)
+#    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 ngettext(Singular, Plural, IsPlural) (Singular)
+#    define bindtextdomain(Domain,Directory) (Domain)
+#    define _(String) (String)
+#    define N_(String) (String)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/xine-engine/xineintl.h.in b/src/xine-engine/xineintl.h.in
deleted file mode 100644
index 4586b3045..000000000
--- a/src/xine-engine/xineintl.h.in
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2000-2002 the xine project
- * 
- * This file is part of xine, a free video player.
- * 
- * xine 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.
- * 
- * xine 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 Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * $Id: xineintl.h.in,v 1.1 2002/12/11 01:04:01 siggi Exp $
- *
- */
-
-#ifndef HAVE_XINEINTL_H
-#define HAVE_XINEINTL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <locale.h>
-
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    define _(String) dgettext ("@LIBNAME@", String)
-#    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 ngettext(Singular, Plural, IsPlural) (Singular)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
-#    define N_(String) (String)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-- 
cgit v1.2.3