vte r2020 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Wed Jan  9 20:48:55 2008
New Revision: 2020
URL: http://svn.gnome.org/viewvc/vte?rev=2020&view=rev

Log:
2008-01-09  Behdad Esfahbod  <behdad gnome org>

        Bug 449131 â Wrong gettext domain

        * src/pty.c:
        * src/reaper.c (vte_reaper_class_init):
        * src/trie.c:
        * src/vtebg.c (vte_bg_class_init):
        * src/vteglyph.c:
        Oops.  Fix all remaining ones too.



Modified:
   trunk/ChangeLog
   trunk/src/pty.c
   trunk/src/reaper.c
   trunk/src/trie.c
   trunk/src/vtebg.c
   trunk/src/vteglyph.c

Modified: trunk/src/pty.c
==============================================================================
--- trunk/src/pty.c	(original)
+++ trunk/src/pty.c	Wed Jan  9 20:48:55 2008
@@ -49,12 +49,7 @@
 #define PTY_RECVMSG_FLAGS 0
 #endif
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(PACKAGE, String)
-#else
-#define _(String) String
-#endif
+#include <glib/gi18n-lib.h>
 
 #ifdef VTE_USE_GNOME_PTY_HELPER
 #include <sys/socket.h>

Modified: trunk/src/reaper.c
==============================================================================
--- trunk/src/reaper.c	(original)
+++ trunk/src/reaper.c	Wed Jan  9 20:48:55 2008
@@ -214,7 +214,10 @@
 {
 	GObjectClass *gobject_class;
 
-	bindtextdomain(PACKAGE, LOCALEDIR);
+	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+#ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+#endif
 
 	klass->child_exited_signal = g_signal_new("child-exited",
 						  G_OBJECT_CLASS_TYPE(klass),

Modified: trunk/src/trie.c
==============================================================================
--- trunk/src/trie.c	(original)
+++ trunk/src/trie.c	Wed Jan  9 20:48:55 2008
@@ -41,12 +41,7 @@
 typedef gunichar wint_t;
 #endif
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(PACKAGE, String)
-#else
-#define _(String) String
-#endif
+#include <glib/gi18n-lib.h>
 
 #ifndef TRIE_MAYBE_STATIC
 #define TRIE_MAYBE_STATIC

Modified: trunk/src/vtebg.c
==============================================================================
--- trunk/src/vtebg.c	(original)
+++ trunk/src/vtebg.c	Wed Jan  9 20:48:55 2008
@@ -230,7 +230,10 @@
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
 
-	bindtextdomain(PACKAGE, LOCALEDIR);
+	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+#ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+#endif
 
 	gobject_class->finalize = vte_bg_finalize;
 

Modified: trunk/src/vteglyph.c
==============================================================================
--- trunk/src/vteglyph.c	(original)
+++ trunk/src/vteglyph.c	Wed Jan  9 20:48:55 2008
@@ -28,13 +28,7 @@
 #include "vtefc.h"
 #include "vteglyph.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(PACKAGE, String)
-#else
-#define _(String) String
-#define bindtextdomain(package,dir)
-#endif
+#include <glib/gi18n-lib.h>
 
 #define FONT_INDEX_FUDGE 10
 #define CHAR_WIDTH_FUDGE 10