AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-19 01:40:10 +00:00
Code Issues Projects Releases Wiki Activity

cssprovider: Get rid of gtk_css_provider_reset_parser()

Browse Source 
Instead call gtk_css_scanner_reset(). There is nothing else we could
need to do.
This commit is contained in:
Benjamin Otte 2011-04-11 02:37:24 +02:00
parent 607846879e
commit 5c940f2bd4
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkcssprovider.c
View File

@ -840,7 +840,6 @@ static void gtk_css_style_provider_iface_init (GtkStyleProviderIface *iface);
static void scanner_apply_scope (GScanner *scanner, static void scanner_apply_scope (GScanner *scanner,
ParserScope scope); ParserScope scope);
static void css_provider_reset_parser (GtkCssProvider *css_provider);
static gboolean gtk_css_provider_load_from_path_internal (GtkCssProvider *css_provider, static gboolean gtk_css_provider_load_from_path_internal (GtkCssProvider *css_provider,
const gchar *path, const gchar *path,
gboolean reset, gboolean reset,
@ -1579,8 +1578,6 @@ gtk_css_provider_finalize (GObject *object)
css_provider = GTK_CSS_PROVIDER (object); css_provider = GTK_CSS_PROVIDER (object);
priv = css_provider->priv; priv = css_provider->priv;
css_provider_reset_parser (css_provider);
gtk_css_scanner_destroy (priv->scanner); gtk_css_scanner_destroy (priv->scanner);
g_ptr_array_free (priv->selectors_info, TRUE); g_ptr_array_free (priv->selectors_info, TRUE);
@ -1755,16 +1752,6 @@ gtk_css_scanner_pop_scope (GScanner *scanner)
scanner_apply_scope (scanner, scope); scanner_apply_scope (scanner, scope);
} }
static void
css_provider_reset_parser (GtkCssProvider *css_provider)
{
GtkCssProviderPrivate *priv;
priv = css_provider->priv;
gtk_css_scanner_reset (priv->scanner);
}
static void static void
css_provider_commit (GtkCssProvider *css_provider, css_provider_commit (GtkCssProvider *css_provider,
GScanner *scanner) GScanner *scanner)
@ -2621,13 +2608,10 @@ parse_stylesheet (GtkCssProvider *css_provider,
{ {
GTokenType expected_token; GTokenType expected_token;
css_provider_reset_parser (css_provider);
expected_token = parse_rule (css_provider, scanner); expected_token = parse_rule (css_provider, scanner);
if (expected_token != G_TOKEN_NONE) if (expected_token != G_TOKEN_NONE)
{ {
css_provider_reset_parser (css_provider);
while (!g_scanner_eof (scanner) && while (!g_scanner_eof (scanner) &&
scanner->token != G_TOKEN_RIGHT_CURLY) scanner->token != G_TOKEN_RIGHT_CURLY)
g_scanner_get_next_token (scanner); g_scanner_get_next_token (scanner);
@ -2636,6 +2620,8 @@ parse_stylesheet (GtkCssProvider *css_provider,
css_provider_commit (css_provider, scanner); css_provider_commit (css_provider, scanner);
g_scanner_get_next_token (scanner); g_scanner_get_next_token (scanner);
gtk_css_scanner_reset (scanner);
} }
if (error) if (error)