From 486c46b9459f7b28528d9144296da9e4a32023d3 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 7 Jun 2010 06:23:24 -0400
Subject: [PATCH] Include the right header

---
 docs/reference/gio/migrating-gconf.xml | 2 +-
 gio/tests/gsettings.c                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/reference/gio/migrating-gconf.xml b/docs/reference/gio/migrating-gconf.xml
index 8df80cd..15b4ff4 100644
--- a/docs/reference/gio/migrating-gconf.xml
+++ b/docs/reference/gio/migrating-gconf.xml
@@ -343,7 +343,7 @@ gsettings_SCHEMAS = my.app.gschema.xml
         extracted into your gettext catalog. One way to do that is to use
         intltool. For that, you use <tag class="starttag">_summary</tag>
         and <tag class="starttag">_description</tag> elements in a
-        .gschema.xml.in file and use <literal>@INTLTOOL_NOMERGE_RULE@</literal>
+        .gschema.xml.in file and use <literal>&commat;INTLTOOL_XML_NOMERGE_RULE&commat;</literal>
         in your Makefile.am to produce the .gschema.xml file. The
         <literal>NOMERGE</literal> part of the rule instructs intltool
         to extract translatable strings, but not merge the translations
diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index 1801724..65751a0 100644
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <locale.h>
 #include <libintl.h>
-#include <gio.h>
+#include <gio/gio.h>
 #include <gstdio.h>
 #define G_SETTINGS_ENABLE_BACKEND
 #include <gio/gsettingsbackend.h>
-- 
2.7.4