Attachment #88609 for bug #134436

Lines 35-41 Link Here

(-)vte-0.12.2.orig/src/iso2022.c (+6 lines)
35	#ifdef HAVE_LOCALE_H	35	#ifdef HAVE_LOCALE_H
36	#include <locale.h>	36	#include <locale.h>
37	#endif	37	#endif
		38
		39	#ifdef ENABLE_NLS
38	#include <glib/gi18n-lib.h>	40	#include <glib/gi18n-lib.h>
		41	#else
		42	#define _(String) String
		43	#define bindtextdomain(package,dir)
		44	#endif
39		45
40	/* Maps which jive with XTerm's ESC ()*+ ? sequences, RFC 1468. Add the	46	/* Maps which jive with XTerm's ESC ()*+ ? sequences, RFC 1468. Add the
41	* PC437 map because despite knowing that XTerm doesn't support it, certain	47	* PC437 map because despite knowing that XTerm doesn't support it, certain

Lines 34-40 Link Here

(-)vte-0.12.2.orig/src/reaper.c (+6 lines)
34	#ifdef HAVE_LOCALE_H	34	#ifdef HAVE_LOCALE_H
35	#include <locale.h>	35	#include <locale.h>
36	#endif	36	#endif
		37
		38	#ifdef ENABLE_NLS
37	#include <glib/gi18n-lib.h>	39	#include <glib/gi18n-lib.h>
		40	#else
		41	#define _(String) String
		42	#define bindtextdomain(package,dir)
		43	#endif
38		44
39	static VteReaper *singleton_reaper = NULL;	45	static VteReaper *singleton_reaper = NULL;
40	struct reaper_info {	46	struct reaper_info {

Lines 47-53 Link Here

(-)vte-0.12.2.orig/src/vte.c (-1 / +7 lines)
47	#ifdef HAVE_LOCALE_H	47	#ifdef HAVE_LOCALE_H
48	#include <locale.h>	48	#include <locale.h>
49	#endif	49	#endif
		50
		51	#ifdef ENABLE_NLS
50	#include <glib/gi18n-lib.h>	52	#include <glib/gi18n-lib.h>
		53	#else
		54	#define _(String) String
		55	#define bindtextdomain(package,dir)
		56	#endif
51		57
52	#ifndef HAVE_WINT_T	58	#ifndef HAVE_WINT_T
53	typedef gunichar wint_t;	59	typedef gunichar wint_t;
Lines 9557-9563 vte_terminal_class_init(VteTerminalClass Link Here
9557	#endif	9563	#endif
9558		9564
9559	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);	9565	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
9560	#ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET	9566	#if HAVE_DECL_BIND_TEXTDOMAIN_CODESET
9561	bind_textdomain_codeset(PACKAGE, "UTF-8");	9567	bind_textdomain_codeset(PACKAGE, "UTF-8");
9562	#endif	9568	#endif
9563		9569

Lines 34-40 Link Here

(-)vte-0.12.2.orig/src/vteaccess.c (+6 lines)
34	#ifdef HAVE_LOCALE_H	34	#ifdef HAVE_LOCALE_H
35	#include <locale.h>	35	#include <locale.h>
36	#endif	36	#endif
		37
		38	#ifdef ENABLE_NLS
37	#include <glib/gi18n-lib.h>	39	#include <glib/gi18n-lib.h>
		40	#else
		41	#define _(String) String
		42	#define bindtextdomain(package,dir)
		43	#endif
38		44
39	#define VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA "VteTerminalAccessiblePrivateData"	45	#define VTE_TERMINAL_ACCESSIBLE_PRIVATE_DATA "VteTerminalAccessiblePrivateData"
40		46

Lines 34-40 Link Here

(-)vte-0.12.2.orig/src/vteapp.c (+5 lines)
34	#include "debug.h"	34	#include "debug.h"
35	#include "vte.h"	35	#include "vte.h"
36		36
		37	#ifdef ENABLE_NLS
37	#include <glib/gi18n-lib.h>	38	#include <glib/gi18n-lib.h>
		39	#else
		40	#define _(String) String
		41	#define bindtextdomain(package,dir)
		42	#endif
38		43
39	#define DINGUS1 "(((news\|telnet\|nttp\|file\|http\|ftp\|https)://)\|(www\|ftp)[-A-Za-z0-9]\\.)[-A-Za-z0-9\\.]+(:[0-9])?"	44	#define DINGUS1 "(((news\|telnet\|nttp\|file\|http\|ftp\|https)://)\|(www\|ftp)[-A-Za-z0-9]\\.)[-A-Za-z0-9\\.]+(:[0-9])?"
40	#define DINGUS2 "(((news\|telnet\|nttp\|file\|http\|ftp\|https)://)\|(www\|ftp)[-A-Za-z0-9]\\.)[-A-Za-z0-9\\.]+(:[0-9])?/[-A-Za-z0-9_\\$\\.\\+\\!\\\$\$,;:@&=\\?/~\\#\\%][^]'\\.}>\\) ,\\\"]"	45	#define DINGUS2 "(((news\|telnet\|nttp\|file\|http\|ftp\|https)://)\|(www\|ftp)[-A-Za-z0-9]\\.)[-A-Za-z0-9\\.]+(:[0-9])?/[-A-Za-z0-9_\\$\\.\\+\\!\\\$\$,;:@&=\\?/~\\#\\%][^]'\\.}>\\) ,\\\"]"

Lines 25-31 Link Here

(-)vte-0.12.2.orig/src/vtebg.c (+5 lines)
25	#include "marshal.h"	25	#include "marshal.h"
26	#include "vtebg.h"	26	#include "vtebg.h"
27		27
		28	#ifdef ENABLE_NLS
28	#include <glib/gi18n-lib.h>	29	#include <glib/gi18n-lib.h>
		30	#else
		31	#define _(String) String
		32	#define bindtextdomain(package,dir)
		33	#endif
29		34
30	struct VteBgPrivate {	35	struct VteBgPrivate {
31	GList *cache;	36	GList *cache;

Lines 37-43 Link Here

(-)vte-0.12.2.orig/src/vtexft.c (+5 lines)
37	#include "vtexft.h"	37	#include "vtexft.h"
38	#include "vtetree.h"	38	#include "vtetree.h"
39		39
		40	#ifdef ENABLE_NLS
40	#include <glib/gi18n-lib.h>	41	#include <glib/gi18n-lib.h>
		42	#else
		43	#define _(String) String
		44	#define bindtextdomain(package,dir)
		45	#endif
41		46
42	#define FONT_INDEX_FUDGE 10	47	#define FONT_INDEX_FUDGE 10
43	#define CHAR_WIDTH_FUDGE 10	48	#define CHAR_WIDTH_FUDGE 10

Return to bug 134436