diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-06-09 11:49:22 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-06-09 13:31:13 -0400 |
| commit | 71ac4d626ea3cca9fa455a5a54d3409978463465 (patch) | |
| tree | 123236018b089d8ffdd6456586b93d24df604a26 | |
| parent | cf6274c979b35ac899d7f7090a7d97ebdfbd95ef (diff) | |
| download | gtk+-71ac4d626ea3cca9fa455a5a54d3409978463465.tar.gz | |
GtkToolPalette: Use G_PARAM_EXPLICIT_NOTIFY
| -rw-r--r-- | gtk/gtktoolpalette.c | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c index 8dd341eba7..52f5bda2cc 100644 --- a/gtk/gtktoolpalette.c +++ b/gtk/gtktoolpalette.c @@ -246,35 +246,39 @@ gtk_tool_palette_set_property (GObject *object, switch (prop_id) { case PROP_ICON_SIZE: - if ((guint) g_value_get_enum (value) != palette->priv->icon_size) + if (palette->priv->icon_size != g_value_get_enum (value)) { palette->priv->icon_size = g_value_get_enum (value); gtk_tool_palette_reconfigured (palette); + g_object_notify_by_pspec (object, pspec); } break; case PROP_ICON_SIZE_SET: - if ((guint) g_value_get_enum (value) != palette->priv->icon_size) + if (palette->priv->icon_size_set != g_value_get_boolean (value)) { - palette->priv->icon_size_set = g_value_get_enum (value); + palette->priv->icon_size_set = g_value_get_boolean (value); gtk_tool_palette_reconfigured (palette); + g_object_notify_by_pspec (object, pspec); } break; case PROP_ORIENTATION: - if ((guint) g_value_get_enum (value) != palette->priv->orientation) + if (palette->priv->orientation != g_value_get_enum (value)) { palette->priv->orientation = g_value_get_enum (value); _gtk_orientable_set_style_classes (GTK_ORIENTABLE (palette)); gtk_tool_palette_reconfigured (palette); + g_object_notify_by_pspec (object, pspec); } break; case PROP_TOOLBAR_STYLE: - if ((guint) g_value_get_enum (value) != palette->priv->style) + if (palette->priv->style != g_value_get_enum (value)) { palette->priv->style = g_value_get_enum (value); gtk_tool_palette_reconfigured (palette); + g_object_notify_by_pspec (object, pspec); } break; @@ -287,13 +291,21 @@ gtk_tool_palette_set_property (GObject *object, break; case PROP_HSCROLL_POLICY: - palette->priv->hscroll_policy = g_value_get_enum (value); - gtk_widget_queue_resize (GTK_WIDGET (palette)); + if (palette->priv->hscroll_policy != g_value_get_enum (value)) + { + palette->priv->hscroll_policy = g_value_get_enum (value); + gtk_widget_queue_resize (GTK_WIDGET (palette)); + g_object_notify_by_pspec (object, pspec); + } break; case PROP_VSCROLL_POLICY: - palette->priv->vscroll_policy = g_value_get_enum (value); - gtk_widget_queue_resize (GTK_WIDGET (palette)); + if (palette->priv->vscroll_policy != g_value_get_enum (value)) + { + palette->priv->vscroll_policy = g_value_get_enum (value); + gtk_widget_queue_resize (GTK_WIDGET (palette)); + g_object_notify_by_pspec (object, pspec); + } break; default: @@ -943,7 +955,7 @@ gtk_tool_palette_class_init (GtkToolPaletteClass *cls) P_("Size of icons in this tool palette"), GTK_TYPE_ICON_SIZE, DEFAULT_ICON_SIZE, - GTK_PARAM_READWRITE)); + GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY)); /** * GtkToolPalette:icon-size-set: @@ -955,10 +967,10 @@ gtk_tool_palette_class_init (GtkToolPaletteClass *cls) g_object_class_install_property (oclass, PROP_ICON_SIZE_SET, g_param_spec_boolean ("icon-size-set", - P_("Icon size set"), - P_("Whether the icon-size property has been set"), - FALSE, - GTK_PARAM_READWRITE)); + P_("Icon size set"), + P_("Whether the icon-size property has been set"), + FALSE, + GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY)); /** * GtkToolPalette:toolbar-style: @@ -973,7 +985,7 @@ gtk_tool_palette_class_init (GtkToolPaletteClass *cls) P_("Style of items in the tool palette"), GTK_TYPE_TOOLBAR_STYLE, DEFAULT_TOOLBAR_STYLE, - GTK_PARAM_READWRITE)); + GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY)); /** |