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

Fix a thinko in the last color button change

Browse Source 
Using the interface method in the set_property implementation
leads to an infinite recursion, if the interface method is in
turn using g_object_set.
This commit is contained in:
Matthias Clasen
2014-05-02 21:09:05 -04:00
parent 70a5e66d2f
commit a41e2b901d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkcolorbutton.c
View File

@ -919,7 +919,7 @@ gtk_color_button_get_property (GObject *object,
switch (param_id) switch (param_id)
{ {
case PROP_USE_ALPHA: case PROP_USE_ALPHA:
g_value_set_boolean (value, gtk_color_chooser_get_use_alpha (GTK_COLOR_CHOOSER (button))); g_value_set_boolean (value, button->priv->use_alpha);
break; break;
case PROP_TITLE: case PROP_TITLE:
g_value_set_string (value, gtk_color_button_get_title (button)); g_value_set_string (value, gtk_color_button_get_title (button));
@ -939,9 +939,13 @@ gtk_color_button_get_property (GObject *object,
} }
break; break;
case PROP_ALPHA: case PROP_ALPHA:
G_GNUC_BEGIN_IGNORE_DEPRECATIONS {
g_value_set_uint (value, gtk_color_button_get_alpha (button)); guint16 alpha;
G_GNUC_END_IGNORE_DEPRECATIONS
alpha = (guint16) (button->priv->rgba.alpha * 65535 + 0.5);
g_value_set_uint (value, alpha);
}
break; break;
case PROP_RGBA: case PROP_RGBA:
{ {