diff options
| author | Juan Pablo Ugarte <jpu@src.gnome.org> | 2007-06-23 18:54:35 +0000 |
|---|---|---|
| committer | Juan Pablo Ugarte <jpu@src.gnome.org> | 2007-06-23 18:54:35 +0000 |
| commit | 36994d860c8723dc57d8a603806ce72ecbb69085 (patch) | |
| tree | 47a57cdde07bbd2b98603173a4b71cb659f18f30 | |
| parent | d563ed22b002b5085dd3abbecb5269815a5d804c (diff) | |
| download | glade-36994d860c8723dc57d8a603806ce72ecbb69085.tar.gz | |
glade_gtk_tool_button_set_type() return if loading fixes #450177.
* plugins/gtk+/glade-gtk.c: glade_gtk_tool_button_set_type() return if loading
fixes #450177. glade_gtk_tool_button_set_icon() show image widget.
svn path=/trunk/; revision=1388
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/gtk+/glade-gtk.c | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2007-06-23 Juan Pablo Ugarte <juanpablougarte@gmail.com> + + * plugins/gtk+/glade-gtk.c: glade_gtk_tool_button_set_type() return if loading + fixes #450177. glade_gtk_tool_button_set_icon() show image widget. + 2007-06-22 Vincent Geddes <vgeddes@gnome.org> * plugins/gnome/glade-gnome.h, diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c index 6fd7aedf..a68a7f8d 100644 --- a/plugins/gtk+/glade-gtk.c +++ b/plugins/gtk+/glade-gtk.c @@ -5399,6 +5399,8 @@ glade_gtk_tool_button_set_type (GObject *object, const GValue *value) g_return_if_fail (GTK_IS_TOOL_BUTTON (object)); gbutton = glade_widget_get_from_gobject (object); + if (glade_util_object_is_loading (object)) return; + glade_widget_property_set_sensitive (gbutton, "icon", FALSE, _("This only applies with file type images")); glade_widget_property_set_sensitive (gbutton, "glade-stock", FALSE, @@ -5520,6 +5522,7 @@ glade_gtk_tool_button_set_icon (GObject *object, const GValue *value) if ((pixbuf = g_value_get_object (value))) { image = gtk_image_new_from_pixbuf (GDK_PIXBUF (pixbuf)); + gtk_widget_show (image); glade_widget_property_set (gbutton, "glade-type", GLADEGTK_IMAGE_FILENAME); } |