diff options
| author | Benjamin Otte <otte@redhat.com> | 2016-04-08 15:25:53 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2016-04-08 16:18:33 +0200 |
| commit | be2d3321aa382dc146c73d3275219d483979f9c2 (patch) | |
| tree | c74075c44cf8ad643b8b5131822cc16570ea0485 | |
| parent | 62b2f979e5ce33ae6ffcd90081ee64bfd6bc945a (diff) | |
| download | gtk+-wip/otte/tokenizer.tar.gz | |
csstokenizer: Export the error locationwip/otte/tokenizer
| -rw-r--r-- | gtk/gtkcsstokenizer.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcsstokenizerprivate.h | 9 | ||||
| -rw-r--r-- | gtk/inspector/css-editor.c | 9 |
3 files changed, 11 insertions, 9 deletions
diff --git a/gtk/gtkcsstokenizer.c b/gtk/gtkcsstokenizer.c index 171c7f2a23..8f9fba359b 100644 --- a/gtk/gtkcsstokenizer.c +++ b/gtk/gtkcsstokenizer.c @@ -588,7 +588,7 @@ gtk_css_tokenizer_emit_error (GtkCssTokenizer *tokenizer, const GError *error) { if (tokenizer->error_func) - tokenizer->error_func (tokenizer, token, error, tokenizer->user_data); + tokenizer->error_func (tokenizer, location, token, error, tokenizer->user_data); else g_warning ("Unhandled CSS error: %zu:%zu: %s", location->lines + 1, location->line_chars + 1, error->message); } diff --git a/gtk/gtkcsstokenizerprivate.h b/gtk/gtkcsstokenizerprivate.h index 7cd5f9ff82..54e4b5afc6 100644 --- a/gtk/gtkcsstokenizerprivate.h +++ b/gtk/gtkcsstokenizerprivate.h @@ -77,10 +77,11 @@ typedef struct _GtkCssDelimToken GtkCssDelimToken; typedef struct _GtkCssNumberToken GtkCssNumberToken; typedef struct _GtkCssDimensionToken GtkCssDimensionToken; -typedef void (* GtkCssTokenizerErrorFunc) (GtkCssTokenizer *parser, - const GtkCssToken *token, - const GError *error, - gpointer user_data); +typedef void (* GtkCssTokenizerErrorFunc) (GtkCssTokenizer *parser, + const GtkCssLocation *location, + const GtkCssToken *token, + const GError *error, + gpointer user_data); struct _GtkCssStringToken { GtkCssTokenType type; diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c index 2801d0a871..c4206e7daf 100644 --- a/gtk/inspector/css-editor.c +++ b/gtk/inspector/css-editor.c @@ -615,10 +615,11 @@ update_token_tags (GtkInspectorCssEditor *ce, } static void -tokenizer_error (GtkCssTokenizer *tokenizer, - const GtkCssToken *token, - const GError *error, - gpointer unused) +tokenizer_error (GtkCssTokenizer *tokenizer, + const GtkCssLocation *location, + const GtkCssToken *token, + const GError *error, + gpointer unused) { GtkCssChunk *chunk = (GtkCssChunk *) token; |