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

csssection: Remove file argument from constructor

Browse Source 
The parser has the file available.
This commit is contained in:
Benjamin Otte
2012-04-18 22:15:32 +02:00
parent a7f238138e
commit 0e4670150a
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkcssprovider.c
View File

@ -1406,8 +1406,7 @@ gtk_css_scanner_push_section (GtkCssScanner *scanner,
section = _gtk_css_section_new (scanner->section,
section_type,
scanner->parser,
scanner->file);
scanner->parser);
if (scanner->section)
gtk_css_section_unref (scanner->section);

9
gtk/gtkcsssection.c
View File

@ -49,13 +49,11 @@ G_DEFINE_BOXED_TYPE (GtkCssSection, gtk_css_section, gtk_css_section_ref, gtk_cs
GtkCssSection *
_gtk_css_section_new (GtkCssSection *parent,
GtkCssSectionType type,
GtkCssParser *parser,
GFile *file)
GtkCssParser *parser)
{
GtkCssSection *section;
g_return_val_if_fail (parser != NULL, NULL);
g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);
section = g_slice_new0 (GtkCssSection);
@ -63,8 +61,9 @@ _gtk_css_section_new (GtkCssSection *parent,
section->section_type = type;
if (parent)
section->parent = gtk_css_section_ref (parent);
if (file)
section->file = g_object_ref (file);
section->file = _gtk_css_parser_get_file (parser);
if (section->file)
g_object_ref (section->file);
section->start_line = _gtk_css_parser_get_line (parser);
section->start_position = _gtk_css_parser_get_position (parser);
section->parser = parser;

3
gtk/gtkcsssectionprivate.h
View File

@ -26,8 +26,7 @@ G_BEGIN_DECLS
GtkCssSection * _gtk_css_section_new (GtkCssSection *parent,
GtkCssSectionType type,
GtkCssParser *parser,
GFile *file);
GtkCssParser *parser);
GtkCssSection * _gtk_css_section_new_for_file (GtkCssSectionType type,
GFile *file);