summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--pango/pango-ot-ruleset.c9
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3dfb51f0..ff40a50e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-08-28 Behdad Esfahbod <behdad@gnome.org>
+ * pango/pango-ot-ruleset.c (pango_ot_ruleset_init),
+ (pango_ot_ruleset_new): Move ruleset initialization to _init()
+ instead of _new().
+
+2007-08-28 Behdad Esfahbod <behdad@gnome.org>
+
Bug 410152 – testboundaries test fails
* configure.in: Require libthai >= 0.1.9
diff --git a/pango/pango-ot-ruleset.c b/pango/pango-ot-ruleset.c
index 141ce262..a40019fa 100644
--- a/pango/pango-ot-ruleset.c
+++ b/pango/pango-ot-ruleset.c
@@ -80,6 +80,10 @@ static void
pango_ot_ruleset_init (PangoOTRuleset *ruleset)
{
ruleset->rules = g_array_new (FALSE, FALSE, sizeof (PangoOTRule));
+ ruleset->script_index[0] = PANGO_OT_NO_SCRIPT;
+ ruleset->script_index[1] = PANGO_OT_NO_SCRIPT;
+ ruleset->language_index[0] = PANGO_OT_DEFAULT_LANGUAGE;
+ ruleset->language_index[1] = PANGO_OT_DEFAULT_LANGUAGE;
}
static void
@@ -173,11 +177,6 @@ pango_ot_ruleset_new (PangoOTInfo *info)
ruleset->info = info;
g_object_add_weak_pointer (ruleset->info, &ruleset->info);
- ruleset->script_index[0] = PANGO_OT_NO_SCRIPT;
- ruleset->script_index[1] = PANGO_OT_NO_SCRIPT;
- ruleset->language_index[0] = PANGO_OT_DEFAULT_LANGUAGE;
- ruleset->language_index[1] = PANGO_OT_DEFAULT_LANGUAGE;
-
return ruleset;
}