patches/vte-02-fcconfig.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 7509 33597f80a7ed
child 9062 9bf267a19346
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7509
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     1
diff -urN vte-0.11.11.orig/src/vtefc.c vte-0.11.11/src/vtefc.c
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     2
--- vte-0.11.11.orig/src/vtefc.c	2004-06-22 05:48:30.000000000 +0000
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     3
+++ vte-0.11.11/src/vtefc.c	2004-06-22 05:50:47.000000000 +0000
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     4
@@ -465,8 +465,7 @@
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     5
 			tmp = FcFontRenderPrepare(NULL,
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     6
 						  pattern,
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     7
 						  fontset->fonts[i]);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     8
-			_vte_fc_defaults_from_gtk(widget, tmp, antialias);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
     9
-			_vte_fc_set_antialias(tmp, antialias);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    10
+			FcConfigSubstitute (NULL, tmp, FcMatchPattern);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    11
 			save = FcPatternDuplicate(tmp);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    12
 			FcPatternDestroy(tmp);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    13
 			g_array_append_val(pattern_array, save);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    14
@@ -480,8 +479,7 @@
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    15
 		match = FcFontMatch(NULL, pattern, &result);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    16
 		if (result == FcResultMatch) {
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    17
 			tmp = FcPatternDuplicate(match);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    18
-			_vte_fc_defaults_from_gtk(widget, tmp, antialias);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    19
-			_vte_fc_set_antialias(tmp, antialias);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    20
+			FcConfigSubstitute (NULL, tmp, FcMatchPattern);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    21
 			save = FcPatternDuplicate(tmp);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    22
 			FcPatternDestroy(tmp);
33597f80a7ed 2006-06-23 Brian Cameron <[email protected]>
bc99092
parents:
diff changeset
    23
 			g_array_append_val(pattern_array, save);