diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-04-02 19:09:56 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-04-02 19:09:56 +0000 |
| commit | 096fdfb79706a5caa5cd7610401808325aee8c31 (patch) | |
| tree | d021711d6e0322251b9d3baf20868255def9a6bf /gtk/gtkoptionmenu.c | |
| parent | c944151a3cecd2ab199d1645e22d74fe9a66df0a (diff) | |
| download | gdk-pixbuf-096fdfb79706a5caa5cd7610401808325aee8c31.tar.gz | |
Reference param spec when caching property values, since we unref it later
Mon Apr 2 15:06:13 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (_gtk_style_peek_property_value): Reference
param spec when caching property values, since we unref it
later when we free the style.
* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): Dont' free
values since they are retrieved with G_VALUE_NO_COPY_CONTENTS.
Diffstat (limited to 'gtk/gtkoptionmenu.c')
| -rw-r--r-- | gtk/gtkoptionmenu.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index d9e52f4c3..525883734 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -339,15 +339,14 @@ gtk_option_menu_get_props (GtkOptionMenu *option_menu, NULL); if (indicator_size) - { - props->indicator_size = *indicator_size; - gtk_requisition_free (indicator_size); - } + props->indicator_size = *indicator_size; + else + props->indicator_size = default_props.indicator_size; + if (indicator_spacing) - { - props->indicator_spacing = *indicator_spacing; - gtk_border_free (indicator_spacing); - } + props->indicator_spacing = *indicator_spacing; + else + props->indicator_spacing = default_props.indicator_spacing; } static void |