diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2001-06-26 16:19:01 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-06-26 16:19:01 +0000 |
| commit | 837b7120a81a4a64ece4dc361efba656641d091f (patch) | |
| tree | d6b210fd337e6643259f848918c8f0b46126b880 /gtk/gtkitemfactory.c | |
| parent | 671b3b0eb06ede434e5e64ff77e7444634cb59a1 (diff) | |
| download | gdk-pixbuf-837b7120a81a4a64ece4dc361efba656641d091f.tar.gz | |
Revert inline-pixbuf changes until Tim comes back to fix missing files
Diffstat (limited to 'gtk/gtkitemfactory.c')
| -rw-r--r-- | gtk/gtkitemfactory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index b47970e76..ff3b8cdd4 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -228,8 +228,8 @@ gtk_item_factory_class_init (GtkItemFactoryClass *class) quark_type_toggle_item = g_quark_from_static_string ("<ToggleItem>"); quark_type_image_item = g_quark_from_static_string ("<ImageItem>"); quark_type_stock_item = g_quark_from_static_string ("<StockItem>"); - quark_type_separator_item = g_quark_from_static_string ("<Separator>"); quark_type_tearoff_item = g_quark_from_static_string ("<Tearoff>"); + quark_type_separator_item = g_quark_from_static_string ("<Separator>"); quark_type_branch = g_quark_from_static_string ("<Branch>"); quark_type_last_branch = g_quark_from_static_string ("<LastBranch>"); } @@ -1228,14 +1228,14 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory, gtk_radio_menu_item_set_group (GTK_RADIO_MENU_ITEM (widget), radio_group); if (GTK_IS_CHECK_MENU_ITEM (widget)) gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (widget), TRUE); - if (type_id == quark_type_image_item) + if (GTK_IS_IMAGE_MENU_ITEM (widget)) { GdkPixbuf *pixbuf = NULL; image = NULL; - pixbuf = gdk_pixbuf_new_from_stream (-1, - entry->extra_data, + pixbuf = gdk_pixbuf_new_from_inline (entry->extra_data, FALSE, + entry->extra_data2, NULL); if (pixbuf) |