From: <sil...@li...> - 2004-10-28 11:20:17
|
Update of /cvsroot/silgraphite/silgraphite/contrib/pangomod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9373 Modified Files: module.diff Log Message: really fix it Index: module.diff =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/module.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- module.diff 28 Oct 2004 10:42:55 -0000 1.3 +++ module.diff 28 Oct 2004 11:20:05 -0000 1.4 @@ -1,10 +1,10 @@ Index: pango/modules.c =================================================================== RCS file: /cvs/gnome/pango/pango/modules.c,v -retrieving revision 1.47 -diff -u -w -r1.47 modules.c ---- pango/modules.c 12 Nov 2003 08:42:43 -0000 1.47 -+++ pango/modules.c 28 Feb 2004 17:21:50 -0000 +retrieving revision 1.48 +diff -u -w -u -w -r1.48 modules.c +--- pango/modules.c 21 Jun 2004 18:25:26 -0000 1.48 ++++ pango/modules.c 28 Oct 2004 11:18:25 -0000 @@ -633,6 +633,10 @@ { PangoMapEntry *entry = NULL; @@ -12,7 +12,7 @@ + PangoMapEntry *preferred_entry = NULL; + + if (map->entries->len) -+ g_warning("got pango_map_engine is actually used"); ++ g_warning("got pango_map_engine is actually used"); if (script < map->entries->len) entry = &g_array_index (map->entries, PangoMapEntry, script); @@ -30,7 +30,7 @@ return pango_engine_pair_get_engine (entry->exact->data); else if (common_entry && common_entry->exact) return pango_engine_pair_get_engine (common_entry->exact->data); -@@ -690,16 +699,23 @@ +@@ -690,6 +699,7 @@ { PangoMapEntry *entry = NULL; PangoMapEntry *common_entry = NULL; @@ -38,13 +38,14 @@ if (script < map->entries->len) entry = &g_array_index (map->entries, PangoMapEntry, script); - +@@ -697,9 +707,15 @@ if (PANGO_SCRIPT_COMMON < map->entries->len) common_entry = &g_array_index (map->entries, PangoMapEntry, PANGO_SCRIPT_COMMON); + if (PANGO_SCRIPT_PREFERRED < map->entries->len) + preferred_entry = &g_array_index (map->entries, PangoMapEntry, PANGO_SCRIPT_PREFERRED); + ++ if (exact_engines) { *exact_engines = NULL; |