| author | Alan Coopersmith <Alan.Coopersmith@Sun.COM> |
| Fri, 17 Apr 2009 19:27:17 -0700 | |
| changeset 688 | ec7ff53634c7 |
| parent 604 | 6fe48a3a12bf |
| child 1179 | 4ad971e180c3 |
| permissions | -rw-r--r-- |
|
688
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
1 |
diff -urp -x '*~' -x '*.orig' modules/om/generic/omGeneric.c modules/om/generic/omGeneric.c |
|
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
2 |
--- modules/om/generic/omGeneric.c 2008-10-07 10:18:17.000000000 -0700 |
|
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
3 |
+++ modules/om/generic/omGeneric.c 2009-04-08 00:19:29.991807000 -0700 |
|
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
4 |
@@ -841,7 +841,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
|
5 |
return True; |
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
6 |
|
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
7 |
/* 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
|
8 |
- 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
|
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 |
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
|
11 |
return -1; |
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
12 |
*last = '*'; |
|
688
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
13 |
@@ -852,7 +852,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
|
14 |
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
|
15 |
return True; |
|
604
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
16 |
} |
|
688
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
17 |
- |
|
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
604
diff
changeset
|
18 |
+ */ |
|
604
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
19 |
|
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
20 |
return False; |
|
6fe48a3a12bf
6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff
changeset
|
21 |
} |