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

shorthand: Remove hack

Browse Source 
This hack was used for parsing back before the refactoring.
This commit is contained in:
Benjamin Otte
2012-01-10 19:11:33 +01:00
parent e603992ac7
commit 78fee2f54b
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -800,11 +800,10 @@ unpack_border_color (GtkCssShorthandProperty *shorthand,
guint *n_params) guint *n_params)
{ {
GParameter *parameter = g_new0 (GParameter, 4); GParameter *parameter = g_new0 (GParameter, 4);
gpointer p;
GType type; GType type;
type = G_VALUE_TYPE (value); type = G_VALUE_TYPE (value);
if (type == G_TYPE_PTR_ARRAY)
type = GTK_TYPE_SYMBOLIC_COLOR;
parameter[0].name = "border-top-color"; parameter[0].name = "border-top-color";
g_value_init (&parameter[0].value, type); g_value_init (&parameter[0].value, type);
@ -815,24 +814,13 @@ unpack_border_color (GtkCssShorthandProperty *shorthand,
parameter[3].name = "border-left-color"; parameter[3].name = "border-left-color";
g_value_init (&parameter[3].value, type); g_value_init (&parameter[3].value, type);
if (G_VALUE_TYPE (value) == G_TYPE_PTR_ARRAY) /* can be RGBA or symbolic color */
{ p = g_value_get_boxed (value);
GPtrArray *array = g_value_get_boxed (value);
guint i;
for (i = 0; i < 4; i++) g_value_set_boxed (&parameter[0].value, p);
g_value_set_boxed (&parameter[i].value, g_ptr_array_index (array, i)); g_value_set_boxed (&parameter[1].value, p);
} g_value_set_boxed (&parameter[2].value, p);
else g_value_set_boxed (&parameter[3].value, p);
{
/* can be RGBA or symbolic color */
gpointer p = g_value_get_boxed (value);
g_value_set_boxed (&parameter[0].value, p);
g_value_set_boxed (&parameter[1].value, p);
g_value_set_boxed (&parameter[2].value, p);
g_value_set_boxed (&parameter[3].value, p);
}
*n_params = 4; *n_params = 4;
return parameter; return parameter;