vte r2293 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Tue Dec  2 12:26:18 2008
New Revision: 2293
URL: http://svn.gnome.org/viewvc/vte?rev=2293&view=rev

Log:
	* configure.in:
	* src/vte-private.h: Move VTE_UTF8_BPC definition from configure to
	vte-private.h.
	* src/vteconv.c: Include vte-private.h here.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/vte-private.h
   trunk/src/vteconv.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Dec  2 12:26:18 2008
@@ -245,9 +245,6 @@
 VTE_DEFAULT_EMULATION=$emulation
 AC_SUBST(VTE_DEFAULT_EMULATION)
 
-# Miscellaneous definitions.
-AC_DEFINE(VTE_UTF8_BPC,6,[Maximum number of bytes used per UTF-8 character.])
-
 # Check for headers.
 AC_CHECK_HEADERS(sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h wchar.h)
 AC_HEADER_TIOCGWINSZ

Modified: trunk/src/vte-private.h
==============================================================================
--- trunk/src/vte-private.h	(original)
+++ trunk/src/vte-private.h	Tue Dec  2 12:26:18 2008
@@ -90,8 +90,11 @@
 #define VTE_MAX_PROCESS_TIME		100
 #define VTE_CELL_BBOX_SLACK		1
 
+#define VTE_UTF8_BPC                    (6) /* Maximum number of bytes used per UTF-8 character */
+
 #define I_(string) (g_intern_static_string(string))
 
+
 /* The structure we use to hold characters we're supposed to display -- this
  * includes any supported visible attributes. */
 struct vte_charcell {

Modified: trunk/src/vteconv.c
==============================================================================
--- trunk/src/vteconv.c	(original)
+++ trunk/src/vteconv.c	Tue Dec  2 12:26:18 2008
@@ -26,6 +26,7 @@
 #include <glib.h>
 #include "buffer.h"
 #include "vteconv.h"
+#include "vte-private.h"
 
 typedef size_t (*convert_func)(GIConv converter,
 			  const guchar **inbuf,