Bug#395133: gnome-terminal: A patch against libvte4-1:0.12.2-4

[Takashi MATSUO]

Package: gnome-terminal
Version: 2.14.2-1
Followup-For: Bug #395133


I notice that this is a libvte4 problem, not a gnome-terminal problem.
So, I wrote a patch against libvte4-1:0.12.2-4. Please check the
attachement. By this patch: gnome-terminal treats ambiguous width
chars as FULLWIDTH only when 'VTE_WIDTH_CJK' environment variable.  It
only affects people who set this environment variable.

Please think about applying this patch.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-suspend2-2.2.8
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)

Versions of packages gnome-terminal depends on:
ii  gnome-control-center       1:2.14.2-3+b1 utilities to configure the GNOME d
ii  gnome-terminal-data        2.14.2-1      Data files for the GNOME terminal 
ii  libatk1.0-0                1.12.3-1      The ATK accessibility toolkit
ii  libbonobo2-0               2.14.0-2      Bonobo CORBA interfaces library
ii  libc6                      2.3.6.ds1-7   GNU C Library: Shared libraries
ii  libgconf2-4                2.16.0-2      GNOME configuration database syste
ii  libglade2-0                1:2.6.0-2     library to load .glade files at ru
ii  libglib2.0-0               2.12.4-1      The GLib library of C routines
ii  libgnome2-0                2.16.0-2      The GNOME 2 library - runtime file
ii  libgnomeui-0               2.14.1-2      The GNOME 2 libraries (User Interf
ii  libgnomevfs2-0             2.14.2-2+b1   GNOME virtual file-system (runtime
ii  libgtk2.0-0                2.8.20-3      The GTK+ graphical user interface 
ii  liborbit2                  1:2.14.0-2    libraries for ORBit2 - a CORBA ORB
ii  libpango1.0-0              1.14.7-1      Layout and rendering of internatio
ii  libpopt0                   1.10-3        lib for parsing cmdline parameters
ii  libstartup-notification0   0.8-2         library for program launch feedbac
ii  libvte4                    1:0.12.2-4    Terminal emulator widget for GTK+ 
ii  libx11-6                   2:1.0.3-2     X11 client-side library
ii  libxrender1                1:0.9.1-3     X Rendering Extension client libra
ii  scrollkeeper               0.3.14-11     A free electronic cataloging syste

Versions of packages gnome-terminal recommends:
ii  yelp                          2.14.3-1   Help browser for GNOME 2

-- no debconf information
-------------- next part --------------
diff -uNr vte-0.12.2/debian/changelog vte-0.12.2-4-vte-width/debian/changelog
--- vte-0.12.2/debian/changelog	2006-10-26 16:45:48.000000000 +0900
+++ vte-0.12.2-4-vte-width/debian/changelog	2006-10-26 16:34:14.000000000 +0900
@@ -1,3 +1,10 @@
+vte (1:0.12.2-4-vte-width-cjk1) unstable; urgency=low
+
+  * treats ambiguous width chars as FULLWIDTH when 'VTE_WIDTH_CJK'
+    environment variable is set.
+
+ -- Takashi Matsuo <tmatsuo at shehas.net>  Thu, 26 Oct 2006 16:32:10 +0900
+
 vte (1:0.12.2-4) unstable; urgency=medium
 
   * Remove references to the forgotten hardcoded python2.3 and python2.4
diff -uNr vte-0.12.2/src/iso2022.c vte-0.12.2-4-vte-width/src/iso2022.c
--- vte-0.12.2/src/iso2022.c	2006-03-15 20:02:59.000000000 +0900
+++ vte-0.12.2-4-vte-width/src/iso2022.c	2006-10-26 16:50:49.000000000 +0900
@@ -400,8 +400,13 @@
 		}
 	}
 
-	/* Not in the list => not wide. */
-	return 1;
+	/* Not in the list => not wide.
+	 * 'VTE_WIDTH_CJK' environmental variable is set => wide.*/
+	if(getenv("VTE_WIDTH_CJK")) {
+		return 2;
+	} else {
+		return 1;
+	}
 }
 
 static GTree *