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

css node declaration: Allow both name and type to be set

Browse Source 
The widget path machinery assumes that we always have types,
and without this change, it will start spewing warnings when
we start to introduce node names.
This commit is contained in:
Matthias Clasen
2015-10-22 20:58:52 -04:00
parent e0d9250a07
commit d1a85fc9e4
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkcssnodedeclaration.c
View File

@ -170,12 +170,10 @@ gboolean
gtk_css_node_declaration_set_type (GtkCssNodeDeclaration **decl,
GType type)
{
if ((*decl)->type == type &&
(*decl)->name == NULL)
if ((*decl)->type == type)
return FALSE;
gtk_css_node_declaration_make_writable (decl);
(*decl)->name = NULL;
(*decl)->type = type;
return TRUE;
@ -191,12 +189,10 @@ gboolean
gtk_css_node_declaration_set_name (GtkCssNodeDeclaration **decl,
/*interned*/ const char *name)
{
if ((*decl)->type == 0 &&
(*decl)->name == name)
if ((*decl)->name == name)
return FALSE;
gtk_css_node_declaration_make_writable (decl);
(*decl)->type = 0;
(*decl)->name = name;
return TRUE;