summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-12-02 19:21:09 -0500
committerMatthias Clasen <mclasen@redhat.com>2021-12-02 19:21:09 -0500
commit2c0aa8b8d3ac2811479976d6477166592b862458 (patch)
tree90c50a482222c5f76737412114dc8438f12071a5
parentca7400bf8d803baa7f9cdf438e5eb344e5070b57 (diff)
downloadpango-2c0aa8b8d3ac2811479976d6477166592b862458.tar.gz
Small fixes
Properly document deserialization errors, and drop unused enum values.
-rw-r--r--pango/pango-layout.h10
-rw-r--r--pango/serializer.c2
2 files changed, 4 insertions, 8 deletions
diff --git a/pango/pango-layout.h b/pango/pango-layout.h
index 32dc16f0..7b3c6ca6 100644
--- a/pango/pango-layout.h
+++ b/pango/pango-layout.h
@@ -382,20 +382,16 @@ gboolean pango_layout_write_to_file (PangoLayout
/**
* PangoLayoutDeserializeError:
- * @PANGO_LAYOUT_SERIALIZE_INVALID: Unspecified error
- * @PANGO_LAYOUT_SERIALIZE_INVALID_SYNTAX: The serialized data had
- * the wrong structure (e.g. a member was expected to be a JSon object,
- * but was an array)
- * @PANGO_LAYOUT_SERIALIZE_INVALID_VALUE: A JSon value could not be
+ * @PANGO_LAYOUT_DESERIALIZE_INVALID: Unspecified error
+ * @PANGO_LAYOUT_DESERIALIZE_INVALID_VALUE: A JSon value could not be
* interpreted
- * @PANGO_LAYOUT_SERIALIZE_MISSING_VALUE: A required JSon member was
+ * @PANGO_LAYOUT_DESERIALIZE_MISSING_VALUE: A required JSon member was
* not found
*
* Errors that can be returned by [func@Pango.Layout.deserialize].
*/
typedef enum {
PANGO_LAYOUT_DESERIALIZE_INVALID,
- PANGO_LAYOUT_DESERIALIZE_INVALID_SYNTAX,
PANGO_LAYOUT_DESERIALIZE_INVALID_VALUE,
PANGO_LAYOUT_DESERIALIZE_MISSING_VALUE,
} PangoLayoutDeserializeError;
diff --git a/pango/serializer.c b/pango/serializer.c
index ff7dd41f..a5c751fd 100644
--- a/pango/serializer.c
+++ b/pango/serializer.c
@@ -708,7 +708,7 @@ attr_for_type (GtkJsonParser *parser,
case PANGO_ATTR_INVALID:
gtk_json_parser_set_error (parser,
g_error_new (PANGO_LAYOUT_DESERIALIZE_ERROR,
- PANGO_LAYOUT_DESERIALIZE_INVALID_VALUE,
+ PANGO_LAYOUT_DESERIALIZE_MISSING_VALUE,
"Missing attribute type"));
return NULL;