From 05969ed56635c4a1a6eb83d299102f475f05588a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 2 Nov 2001 00:48:28 +0000 Subject: [PATCH] Actually add the missing/broken image icon as the image for the "missing Thu Nov 1 19:44:48 2001 Owen Taylor * gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am: Actually add the missing/broken image icon as the image for the "missing image" stock icon. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkiconfactory.c | 7 ++----- gtk/stock-icons/Makefile.am | 2 ++ 9 files changed, 46 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8f1628f9e..903ef8cb13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 1 19:44:48 2001 Owen Taylor + + * gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am: + Actually add the missing/broken image icon as the + image for the "missing image" stock icon. + Thu Nov 1 19:18:34 2001 Owen Taylor * demos/gtk-demo/stock_browser.c (do_stock_browser): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b8f1628f9e..903ef8cb13 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Thu Nov 1 19:44:48 2001 Owen Taylor + + * gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am: + Actually add the missing/broken image icon as the + image for the "missing image" stock icon. + Thu Nov 1 19:18:34 2001 Owen Taylor * demos/gtk-demo/stock_browser.c (do_stock_browser): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b8f1628f9e..903ef8cb13 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Nov 1 19:44:48 2001 Owen Taylor + + * gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am: + Actually add the missing/broken image icon as the + image for the "missing image" stock icon. + Thu Nov 1 19:18:34 2001 Owen Taylor * demos/gtk-demo/stock_browser.c (do_stock_browser): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b8f1628f9e..903ef8cb13 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Nov 1 19:44:48 2001 Owen Taylor + + * gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am: + Actually add the missing/broken image icon as the + image for the "missing image" stock icon. + Thu Nov 1 19:18:34 2001 Owen Taylor * demos/gtk-demo/stock_browser.c (do_stock_browser): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b8f1628f9e..903ef8cb13 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Nov 1 19:44:48 2001 Owen Taylor + + * gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am: + Actually add the missing/broken image icon as the + image for the "missing image" stock icon. + Thu Nov 1 19:18:34 2001 Owen Taylor * demos/gtk-demo/stock_browser.c (do_stock_browser): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b8f1628f9e..903ef8cb13 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Nov 1 19:44:48 2001 Owen Taylor + + * gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am: + Actually add the missing/broken image icon as the + image for the "missing image" stock icon. + Thu Nov 1 19:18:34 2001 Owen Taylor * demos/gtk-demo/stock_browser.c (do_stock_browser): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b8f1628f9e..903ef8cb13 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Nov 1 19:44:48 2001 Owen Taylor + + * gtk/gtkiconfactory.c gtk/stock-icons/Makefile.am: + Actually add the missing/broken image icon as the + image for the "missing image" stock icon. + Thu Nov 1 19:18:34 2001 Owen Taylor * demos/gtk-demo/stock_browser.c (do_stock_browser): diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 2c62650e8e..551110baad 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -57,9 +57,6 @@ struct _GtkIconSource guint any_size : 1; }; -/* FIXME use a better icon for this */ -#define MISSING_IMAGE_INLINE dialog_error - static gpointer parent_class = NULL; static void gtk_icon_factory_init (GtkIconFactory *icon_factory); @@ -454,7 +451,7 @@ get_default_icons (GtkIconFactory *factory) { /* KEEP IN SYNC with gtkstock.c */ - add_unsized (factory, MISSING_IMAGE_INLINE, GTK_STOCK_MISSING_IMAGE); + add_unsized (factory, stock_missing_image, GTK_STOCK_MISSING_IMAGE); add_sized (factory, dialog_error, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_ERROR); add_sized (factory, dialog_info, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_INFO); @@ -1094,7 +1091,7 @@ render_fallback_image (GtkStyle *style, static GtkIconSource fallback_source = { NULL, NULL, 0, 0, 0, TRUE, TRUE, TRUE }; if (fallback_source.pixbuf == NULL) - fallback_source.pixbuf = gdk_pixbuf_new_from_inline (-1, MISSING_IMAGE_INLINE, FALSE, NULL); + fallback_source.pixbuf = gdk_pixbuf_new_from_inline (-1, stock_missing_image, FALSE, NULL); return gtk_style_render_icon (style, &fallback_source, diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index a91f9a3227..41a3aeb13e 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -10,6 +10,7 @@ IMAGES = @STRIP_BEGIN@ \ stock_align_left.png \ stock_align_right.png \ stock_bottom.png \ + stock_broken_image.png \ stock_button_apply.png \ stock_button_cancel.png \ stock_button_close.png \ @@ -114,6 +115,7 @@ VARIABLES = @STRIP_BEGIN@ \ stock_menu_print_preview $(srcdir)/stock_menu_print_preview.png \ stock_menu_sort_ascending $(srcdir)/stock_menu_sort_ascending.png \ stock_menu_sort_descending $(srcdir)/stock_menu_sort_descending.png \ + stock_missing_image $(srcdir)/stock_broken_image.png \ stock_new $(srcdir)/stock_new.png \ stock_open $(srcdir)/stock_open.png \ stock_paste $(srcdir)/stock_paste.png \