| author | X gate hg captive account <xhg@xserver.sfbay.sun.com> |
| Fri, 23 Sep 2011 15:47:54 -0700 | |
| changeset 1216 | 3838ec082c2e |
| parent 1179 | 4ad971e180c3 |
| permissions | -rw-r--r-- |
|
1179
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
688
diff
changeset
|
1 |
diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c |
|
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
688
diff
changeset
|
2 |
index 7f02c85..c5d9416 100644 |
|
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
688
diff
changeset
|
3 |
--- a/modules/om/generic/omGeneric.c |
|
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
688
diff
changeset
|
4 |
+++ b/modules/om/generic/omGeneric.c |
|
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
688
diff
changeset
|
5 |
@@ -832,7 +832,7 @@ parse_omit_name( |
|
604
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
6 |
return True; |
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
7 |
|
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
8 |
/* This may mot be needed anymore as XListFonts() takes care of this */ |
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
9 |
- while (num_fields < 12) {
|
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
10 |
+/* while (num_fields < 12) {
|
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
11 |
if ((last - buf) > (XLFD_MAX_LEN - 2)) |
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
12 |
return -1; |
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
13 |
*last = '*'; |
|
1179
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
688
diff
changeset
|
14 |
@@ -843,7 +843,7 @@ parse_omit_name( |
|
604
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
15 |
if ((font_data->xlfd_name = get_font_name(oc, buf)) != NULL) |
|
688
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
16 |
return True; |
|
604
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
17 |
} |
|
688
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
18 |
- |
|
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
19 |
+ */ |
|
604
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
20 |
|
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
21 |
return False; |
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
22 |
} |