AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "cssprovider: Remove unused members from scanner"

Browse Source 
This reverts commit b501e64a8a.
This commit is contained in:
Benjamin Otte 2012-05-11 16:41:25 +02:00
parent b501e64a8a
commit a8d8c02ab7
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkcssprovider.c
View File

@ -999,6 +999,8 @@ struct _GtkCssScanner
GtkCssParser *parser;
GtkCssSection *section;
GtkCssScanner *parent;
GFile *file;
GFile *base;
GSList *state;
};
@ -1309,6 +1311,9 @@ gtk_css_scanner_destroy (GtkCssScanner *scanner)
if (scanner->section)
gtk_css_section_unref (scanner->section);
g_object_unref (scanner->provider);
if (scanner->file)
g_object_unref (scanner->file);
g_object_unref (scanner->base);
_gtk_css_parser_free (scanner->parser);
g_slice_free (GtkCssScanner, scanner);
@ -1352,6 +1357,18 @@ gtk_css_scanner_new (GtkCssProvider *provider,
if (section)
scanner->section = gtk_css_section_ref (section);
if (file)
{
scanner->file = g_object_ref (file);
scanner->base = g_file_get_parent (file);
}
else
{
char *dir = g_get_current_dir ();
scanner->base = g_file_new_for_path (dir);
g_free (dir);
}
scanner->parser = _gtk_css_parser_new (text,
gtk_css_scanner_parser_error,
scanner);
@ -1359,14 +1376,19 @@ gtk_css_scanner_new (GtkCssProvider *provider,
return scanner;
}
static GFile *
gtk_css_scanner_get_base_url (GtkCssScanner *scanner)
{
return scanner->base;
}
static gboolean
gtk_css_scanner_would_recurse (GtkCssScanner *scanner,
GFile *file)
{
while (scanner)
{
GFile *parser_file = _gtk_css_parser_get_file (scanner->parser);
if (parser_file && g_file_equal (parser_file, file))
if (scanner->file && g_file_equal (scanner->file, file))
return TRUE;
scanner = scanner->parent;
@ -1871,7 +1893,7 @@ parse_import (GtkCssScanner *scanner)
char *uri;
uri = _gtk_css_parser_read_string (scanner->parser);
file = _gtk_css_parser_get_file_for_path (scanner->parser, uri);
file = g_file_resolve_relative_path (gtk_css_scanner_get_base_url (scanner), uri);
g_free (uri);
}
else