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

tests: Fix deprecation warnings in prop-editor

Browse Source
This commit is contained in:
Benjamin Otte
2012-01-07 16:14:31 +01:00
parent f6d2f4fa8d
commit 2359f03b6b
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/prop-editor.c
View File

@ -708,20 +708,23 @@ static void
color_modified (GtkColorButton *cb, gpointer data) color_modified (GtkColorButton *cb, gpointer data)
{ {
ObjectProperty *p = data; ObjectProperty *p = data;
GdkColor color; GValue val = G_VALUE_INIT;
gtk_color_button_get_color (cb, &color); g_value_init (&val, GDK_TYPE_COLOR);
g_object_get_property (G_OBJECT (cb), "color", &val);
if (is_child_property (p->spec)) if (is_child_property (p->spec))
{ {
GtkWidget *widget = GTK_WIDGET (p->obj); GtkWidget *widget = GTK_WIDGET (p->obj);
GtkWidget *parent = gtk_widget_get_parent (widget); GtkWidget *parent = gtk_widget_get_parent (widget);
gtk_container_child_set (GTK_CONTAINER (parent), gtk_container_child_set_property (GTK_CONTAINER (parent),
widget, p->spec->name, &color, NULL); widget, p->spec->name, &val);
} }
else else
g_object_set (p->obj, p->spec->name, &color, NULL); g_object_set_property (p->obj, p->spec->name, &val);
g_value_unset (&val);
} }
static void static void
@ -729,19 +732,14 @@ color_changed (GObject *object, GParamSpec *pspec, gpointer data)
{ {
GtkColorButton *cb = GTK_COLOR_BUTTON (data); GtkColorButton *cb = GTK_COLOR_BUTTON (data);
GValue val = G_VALUE_INIT; GValue val = G_VALUE_INIT;
GdkColor *color;
GdkColor cb_color;
g_value_init (&val, GDK_TYPE_COLOR); g_value_init (&val, GDK_TYPE_COLOR);
get_property_value (object, pspec, &val); get_property_value (object, pspec, &val);
color = g_value_get_boxed (&val); if (g_value_get_boxed (&val))
gtk_color_button_get_color (cb, &cb_color);
if (color != NULL && !gdk_color_equal (color, &cb_color))
{ {
block_controller (G_OBJECT (cb)); block_controller (G_OBJECT (cb));
gtk_color_button_set_color (cb, color); g_object_set_property (G_OBJECT (cb), "color", &val);
unblock_controller (G_OBJECT (cb)); unblock_controller (G_OBJECT (cb));
} }