From f8a9f39466967d490fa1607dcbfeb53ae725be6a Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 29 Mar 2015 21:00:11 +0200 Subject: [PATCH] libgimpwidgets: use gtk_window_set_default_icon_name() instead of gtk_window_set_default_icon_list() which requires having actual GdkPixbufs around. Move the 32x32 and 48x48 wilber images to the icon theme, and remove all inline pixbuf generation stuff from libgimpwidgets. --- .../wilber-32.png => icons/32/gimp-wilber.png | Bin .../wilber-48.png => icons/48/gimp-wilber.png | Bin icons/Makefile.am | 8 +++-- libgimpwidgets/.gitignore | 1 - libgimpwidgets/Makefile.am | 28 ++---------------- libgimpwidgets/gimpwidgets-private.c | 24 +-------------- libgimpwidgets/wilber-16.png | Bin 765 -> 0 bytes libgimpwidgets/wilber-64.png | Bin 4644 -> 0 bytes 8 files changed, 8 insertions(+), 53 deletions(-) rename libgimpwidgets/wilber-32.png => icons/32/gimp-wilber.png (100%) rename libgimpwidgets/wilber-48.png => icons/48/gimp-wilber.png (100%) delete mode 100644 libgimpwidgets/wilber-16.png delete mode 100644 libgimpwidgets/wilber-64.png diff --git a/libgimpwidgets/wilber-32.png b/icons/32/gimp-wilber.png similarity index 100% rename from libgimpwidgets/wilber-32.png rename to icons/32/gimp-wilber.png diff --git a/libgimpwidgets/wilber-48.png b/icons/48/gimp-wilber.png similarity index 100% rename from libgimpwidgets/wilber-48.png rename to icons/48/gimp-wilber.png diff --git a/icons/Makefile.am b/icons/Makefile.am index 71b007cb2b..373ae6bda2 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -397,7 +397,8 @@ icons32_DATA = \ 32/gimp-layer-mask.png \ 32/gimp-layer.png \ 32/gimp-text-layer.png \ - 32/gimp-user-manual.png + 32/gimp-user-manual.png \ + 32/gimp-wilber.png icons48_DATA = \ 48/gimp-channel-alpha.png \ @@ -444,8 +445,9 @@ icons48_DATA = \ 48/gimp-prefs-theme.png \ 48/gimp-prefs-tool-options.png \ 48/gimp-prefs-toolbox.png \ - 48/gimp-prefs-window-management.png - 48/gimp-text-layer.png + 48/gimp-prefs-window-management.png \ + 48/gimp-text-layer.png \ + 48/gimp-wilber.png icons64_DATA = \ 64/gimp-error.png \ diff --git a/libgimpwidgets/.gitignore b/libgimpwidgets/.gitignore index 4ba0e12900..719398917c 100644 --- a/libgimpwidgets/.gitignore +++ b/libgimpwidgets/.gitignore @@ -5,7 +5,6 @@ /Makefile /Makefile.in /_libs -/gimp-wilber-pixbufs.h /gimpwidgetsmarshal.c /gimpwidgetsmarshal.h /makefile.mingw diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index bf1e95d2b9..5ad18c3471 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -185,7 +185,6 @@ libgimpwidgets_sources = \ gimp3migration.h libgimpwidgets_built_sources = \ - gimp-wilber-pixbufs.h \ gimpwidgetsenums.c \ gimpwidgetsmarshal.c \ gimpwidgetsmarshal.h @@ -275,35 +274,16 @@ libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \ $(libm) -## Wilber icons for the window managaer, compiled in - -WILBER_IMAGES = \ - wilber-16.png \ - wilber-32.png \ - wilber-48.png \ - wilber-64.png - -WILBER_VARIABLES = \ - wilber_16 $(srcdir)/wilber-16.png \ - wilber_32 $(srcdir)/wilber-32.png \ - wilber_48 $(srcdir)/wilber-48.png \ - wilber_64 $(srcdir)/wilber-64.png - - EXTRA_DIST = \ gimpwidgets.def \ - $(libgimpwidgets_extra_sources) \ - $(WILBER_IMAGES) - - -gimpwidgets-private.lo: gimp-wilber-pixbufs.h + $(libgimpwidgets_extra_sources) # # rules to generate built sources # # setup autogeneration dependancies -gen_sources = xgen-wec xgen-wmh xgen-wmc gimp-wilber-pixbufs.h +gen_sources = xgen-wec xgen-wmh xgen-wmc CLEANFILES = $(gen_sources) gimpwidgetsenums.c: $(srcdir)/gimpwidgetsenums.h $(GIMP_MKENUMS) @@ -332,10 +312,6 @@ gimpwidgetsmarshal.c: gimpwidgetsmarshal.h && rm -f xgen-wmc xgen-wmc~ -gimp-wilber-pixbufs.h: $(WILBER_IMAGES) Makefile.am - $(AM_V_GEN) $(GDK_PIXBUF_CSOURCE) --raw --build-list $(WILBER_VARIABLES) > $(@F) - - # # test programs, not installed # diff --git a/libgimpwidgets/gimpwidgets-private.c b/libgimpwidgets/gimpwidgets-private.c index 61f9ac4a76..e9f19d444d 100644 --- a/libgimpwidgets/gimpwidgets-private.c +++ b/libgimpwidgets/gimpwidgets-private.c @@ -32,8 +32,6 @@ #include "libgimp/libgimp-intl.h" -#include "gimp-wilber-pixbufs.h" - GimpHelpFunc _gimp_standard_help_func = NULL; GimpGetColorFunc _gimp_get_foreground_func = NULL; @@ -66,18 +64,6 @@ gimp_widgets_init (GimpHelpFunc standard_help_func, { static gboolean gimp_widgets_initialized = FALSE; - GdkPixbuf *pixbuf; - GList *icon_list = NULL; - gint i; - - const guint8 *inline_pixbufs[] = - { - wilber_64, - wilber_48, - wilber_32, - wilber_16 - }; - g_return_if_fail (standard_help_func != NULL); if (gimp_widgets_initialized) @@ -90,15 +76,7 @@ gimp_widgets_init (GimpHelpFunc standard_help_func, gimp_stock_init (); - for (i = 0; i < G_N_ELEMENTS (inline_pixbufs); i++) - { - pixbuf = gdk_pixbuf_new_from_inline (-1, inline_pixbufs[i], FALSE, NULL); - icon_list = g_list_prepend (icon_list, pixbuf); - } - - gtk_window_set_default_icon_list (icon_list); - - g_list_free_full (icon_list, (GDestroyNotify) g_object_unref); + gtk_window_set_default_icon_name (GIMP_STOCK_WILBER); gimp_widgets_init_foreign_enums (); diff --git a/libgimpwidgets/wilber-16.png b/libgimpwidgets/wilber-16.png deleted file mode 100644 index 3fa3ffaf9d36b0f6f259f5ca078b3d6b95a25820..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 765 zcmV>6by32TpIuY0*XmQ zK~y-)t&&klQ(+Xxf8Y1r+3s~#PB%9*w6s~-W|V2g2!ed99twi6_Z}mNAbJhLD4%@CgM){>zv_my4e91UQz)1F zY7`d=IIfFr+q@i4Ee;;sZ#{VQ%r#aoIC1Q#S9(ka1_qE)@p>ZFwp3Z-!ug8`A$a>{ zk|&QJuz6$1%FWIIV5~$9V7^%5&#t*smA=-9;2&?$n!AON;)lT0Q#a^x@`kB3sRh#?h#E7$uQM@ExL z|J9Lea`aA;#l=P9@i^1d(^Sf301AZy!^6Y8d-on?c#ujVo>( z&YeBY?c2AQn0!fo?koA{PY8wENhA`KN+l9Et~3ALrd+8wzz-1!2Ci6^b*3>GHtc+k z_V9Z8Vx34OSSV`zfe^|tSX1YvTC4K-;TYYK2Vu8?W2iF9u2sB3QW3uP!Q z%S0)Or>>4lrGjOdgu)xi&wY2l%`I3{Q&VyE%LCbL_I|LXCH*;*-C-!@uQ@LDmQOS_ zHxmek2(+{!lu0gc^YL?bTq$)algYeV?L-MU{R92|j^iAzR;z8mHlV|GT|bc4T7S|t vJ?r!NMpLQO9sUQ@ANm6Du4DnYzYqKb!z}cot&$4S00000NkvXXu0mjfX#j7g diff --git a/libgimpwidgets/wilber-64.png b/libgimpwidgets/wilber-64.png deleted file mode 100644 index 91540e3d9d4c4cd7cd52bdaa28d5e4e5c138fc2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4644 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 afd2#5)+KY7N^6z?0000