X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fglib-compile-schemas.c;h=e42949b85d540ba7c52c264faacce3bdee7da5d8;hb=2a53b4d0e2c98a14aedf31e38f0ad1fb2e8fe26f;hp=41c5b76b84b7d040b93764b95a1e700b06fb8f17;hpb=3ac6cfaeaadc82ce7d8b9dba7134d5ea7272c70c;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 41c5b76..e42949b 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see .
*
* Author: Ryan Lortie
*/
@@ -29,10 +27,6 @@
#include
#include
-#ifdef HAVE_UNISTD_H
-#include
-#endif
-
#include "gvdb/gvdb-builder.h"
#include "strinfo.c"
@@ -1126,7 +1120,7 @@ parse_state_start_schema (ParseState *state,
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT,
- _(" extends not-yet-existing "
+ _(" extends not yet existing "
"schema '%s'"), id, extends_name);
return;
}
@@ -1142,7 +1136,7 @@ parse_state_start_schema (ParseState *state,
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT,
- _(" is list of not-yet-existing "
+ _(" is list of not yet existing "
"schema '%s'"), id, list_of);
return;
}
@@ -1728,7 +1722,8 @@ parse_gschema_files (gchar **files,
context = g_markup_parse_context_new (&parser,
G_MARKUP_TREAT_CDATA_AS_TEXT |
- G_MARKUP_PREFIX_ERROR_POSITION,
+ G_MARKUP_PREFIX_ERROR_POSITION |
+ G_MARKUP_IGNORE_QUALIFIED,
&state, NULL);
@@ -1861,8 +1856,8 @@ set_overrides (GHashTable *schema_table,
if (state == NULL)
{
- fprintf (stderr, _("No such key `%s' in schema `%s' as "
- "specified in override file `%s'"),
+ fprintf (stderr, _("No such key '%s' in schema '%s' as "
+ "specified in override file '%s'"),
key, group, filename);
if (!strict)
@@ -1887,8 +1882,8 @@ set_overrides (GHashTable *schema_table,
if (value == NULL)
{
- fprintf (stderr, _("error parsing key `%s' in schema `%s' "
- "as specified in override file `%s': "
+ fprintf (stderr, _("error parsing key '%s' in schema '%s' "
+ "as specified in override file '%s': "
"%s."),
key, group, filename, error->message);
@@ -1915,8 +1910,8 @@ set_overrides (GHashTable *schema_table,
g_variant_compare (value, state->maximum) > 0)
{
fprintf (stderr,
- _("override for key `%s' in schema `%s' in "
- "override file `%s' is outside the range "
+ _("override for key '%s' in schema '%s' in "
+ "override file '%s' is outside the range "
"given in the schema"),
key, group, filename);
@@ -1943,8 +1938,8 @@ set_overrides (GHashTable *schema_table,
if (!is_valid_choices (value, state->strinfo))
{
fprintf (stderr,
- _("override for key `%s' in schema `%s' in "
- "override file `%s' is not in the list "
+ _("override for key '%s' in schema '%s' in "
+ "override file '%s' is not in the list "
"of valid choices"),
key, group, filename);