callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkRecentFilter: Use the new helpers

Browse Source 
Instead of issuing g_warning, fill the provided GError.
This lets us test this error handling, and is the right
thing to do. Use the new GtkBuilder helpers and
g_markup_collect_attributes to do so.
This commit is contained in:
Matthias Clasen
2015-04-25 19:36:09 -04:00
parent 8ae4a82ae4
commit 19f3188763
1 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
gtk/gtkrecentfilter.c
View File

@ -76,6 +76,7 @@
#include "gtkrecentfilter.h" #include "gtkrecentfilter.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
@ -236,6 +237,7 @@ typedef enum {
typedef struct { typedef struct {
GtkRecentFilter *filter; GtkRecentFilter *filter;
GtkBuilder *builder;
ParserType type; ParserType type;
GString *string; GString *string;
gboolean parsing; gboolean parsing;
@ -249,31 +251,50 @@ parser_start_element (GMarkupParseContext *context,
gpointer user_data, gpointer user_data,
GError **error) GError **error)
{ {
SubParserData *parser_data = (SubParserData*)user_data; SubParserData *data = (SubParserData*)user_data;
if (strcmp (element_name, "mime-types") == 0) if (!g_markup_collect_attributes (element_name, names, values, error,
G_MARKUP_COLLECT_INVALID, NULL, NULL,
G_MARKUP_COLLECT_INVALID))
{
_gtk_builder_prefix_error (data->builder, context, error);
return; return;
}
if (strcmp (element_name, "mime-types") == 0 ||
strcmp (element_name, "patterns") == 0 ||
strcmp (element_name, "applications") == 0)
{
if (!_gtk_builder_check_parent (data->builder, context, "object", error))
return;
}
else if (strcmp (element_name, "mime-type") == 0) else if (strcmp (element_name, "mime-type") == 0)
{ {
parser_data->parsing = TRUE; if (!_gtk_builder_check_parent (data->builder, context, "mime-types", error))
return; return;
data->parsing = TRUE;
} }
else if (strcmp (element_name, "patterns") == 0)
return;
else if (strcmp (element_name, "pattern") == 0) else if (strcmp (element_name, "pattern") == 0)
{ {
parser_data->parsing = TRUE; if (!_gtk_builder_check_parent (data->builder, context, "patterns", error))
return; return;
data->parsing = TRUE;
} }
else if (strcmp (element_name, "applications") == 0)
return;
else if (strcmp (element_name, "application") == 0) else if (strcmp (element_name, "application") == 0)
{ {
parser_data->parsing = TRUE; if (!_gtk_builder_check_parent (data->builder, context, "applications", error))
return; return;
data->parsing = TRUE;
} }
else else
g_warning ("Unsupported tag for GtkRecentFilter: %s\n", element_name); {
_gtk_builder_error_unhandled_tag (data->builder, context,
"GtkRecentFilter", element_name,
error);
}
} }
static void static void
@ -283,10 +304,10 @@ parser_text_element (GMarkupParseContext *context,
gpointer user_data, gpointer user_data,
GError **error) GError **error)
{ {
SubParserData *parser_data = (SubParserData*)user_data; SubParserData *data = (SubParserData*)user_data;
if (parser_data->parsing) if (data->parsing)
g_string_append_len (parser_data->string, text, text_len); g_string_append_len (data->string, text, text_len);
} }
static void static void
@ -295,28 +316,28 @@ parser_end_element (GMarkupParseContext *context,
gpointer user_data, gpointer user_data,
GError **error) GError **error)
{ {
SubParserData *parser_data = (SubParserData*)user_data; SubParserData *data = (SubParserData*)user_data;
if (parser_data->string) if (data->string)
{ {
switch (parser_data->type) switch (data->type)
{ {
case PARSE_MIME_TYPES: case PARSE_MIME_TYPES:
gtk_recent_filter_add_mime_type (parser_data->filter, parser_data->string->str); gtk_recent_filter_add_mime_type (data->filter, data->string->str);
break; break;
case PARSE_PATTERNS: case PARSE_PATTERNS:
gtk_recent_filter_add_pattern (parser_data->filter, parser_data->string->str); gtk_recent_filter_add_pattern (data->filter, data->string->str);
break; break;
case PARSE_APPLICATIONS: case PARSE_APPLICATIONS:
gtk_recent_filter_add_application (parser_data->filter, parser_data->string->str); gtk_recent_filter_add_application (data->filter, data->string->str);
break; break;
default: default:
break; break;
} }
} }
g_string_set_size (parser_data->string, 0); g_string_set_size (data->string, 0);
parser_data->parsing = FALSE; data->parsing = FALSE;
} }
static const GMarkupParser sub_parser = static const GMarkupParser sub_parser =
@ -332,42 +353,45 @@ gtk_recent_filter_buildable_custom_tag_start (GtkBuildable *buildable,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
GMarkupParser *parser, GMarkupParser *parser,
gpointer *data) gpointer *parser_data)
{ {
SubParserData *parser_data = NULL; SubParserData *data = NULL;
if (strcmp (tagname, "mime-types") == 0) if (strcmp (tagname, "mime-types") == 0)
{ {
parser_data = g_slice_new0 (SubParserData); data = g_slice_new0 (SubParserData);
parser_data->string = g_string_new (""); data->string = g_string_new ("");
parser_data->type = PARSE_MIME_TYPES; data->type = PARSE_MIME_TYPES;
parser_data->filter = GTK_RECENT_FILTER (buildable); data->filter = GTK_RECENT_FILTER (buildable);
data->builder = builder;
*parser = sub_parser; *parser = sub_parser;
*data = parser_data; *parser_data = data;
} }
else if (strcmp (tagname, "patterns") == 0) else if (strcmp (tagname, "patterns") == 0)
{ {
parser_data = g_slice_new0 (SubParserData); data = g_slice_new0 (SubParserData);
parser_data->string = g_string_new (""); data->string = g_string_new ("");
parser_data->type = PARSE_PATTERNS; data->type = PARSE_PATTERNS;
parser_data->filter = GTK_RECENT_FILTER (buildable); data->filter = GTK_RECENT_FILTER (buildable);
data->builder = builder;
*parser = sub_parser; *parser = sub_parser;
*data = parser_data; *parser_data = data;
} }
else if (strcmp (tagname, "applications") == 0) else if (strcmp (tagname, "applications") == 0)
{ {
parser_data = g_slice_new0 (SubParserData); data = g_slice_new0 (SubParserData);
parser_data->string = g_string_new (""); data->string = g_string_new ("");
parser_data->type = PARSE_APPLICATIONS; data->type = PARSE_APPLICATIONS;
parser_data->filter = GTK_RECENT_FILTER (buildable); data->filter = GTK_RECENT_FILTER (buildable);
data->builder = builder;
*parser = sub_parser; *parser = sub_parser;
*data = parser_data; *parser_data = data;
} }
return parser_data != NULL; return data != NULL;
} }
static void static void
@ -375,16 +399,16 @@ gtk_recent_filter_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data) gpointer *parser_data)
{ {
if (strcmp (tagname, "mime-types") == 0 || if (strcmp (tagname, "mime-types") == 0 ||
strcmp (tagname, "patterns") == 0 || strcmp (tagname, "patterns") == 0 ||
strcmp (tagname, "applications") == 0) strcmp (tagname, "applications") == 0)
{ {
SubParserData *parser_data = (SubParserData*)data; SubParserData *data = (SubParserData*)parser_data;
g_string_free (parser_data->string, TRUE); g_string_free (data->string, TRUE);
g_slice_free (SubParserData, parser_data); g_slice_free (SubParserData, data);
} }
} }