summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--pango/pangox.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d0793024..9e2010a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-10 Kjartan Maraas <kmaraas@gnome.org>
+
+ * pango/pangox.c: (get_context_info): Fix a gcc warning.
+
2008-10-06 Christian Persch <chpe@gnome.org>
Bug 539623 – document that pango_color_parse accepts NULL
diff --git a/pango/pangox.c b/pango/pangox.c
index b542f852..3b00d95f 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -162,7 +162,7 @@ static PangoXContextInfo *
get_context_info (PangoContext *context)
{
PangoXContextInfo *info;
- static quark = 0;
+ static GQuark quark = 0;
if (G_UNLIKELY (!quark))
quark = g_quark_from_static_string ("pango-x-info");