From eea4913dd7c55695464331ae156e2a94c0d3d40b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 16 Jun 2008 13:38:58 +0000 Subject: [PATCH] Add some symlinks to the builtin icon theme svn path=/trunk/; revision=20399 --- ChangeLog | 6 ++++++ gtk/Makefile.am | 18 +++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec7495dbc5..f7c2547f37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-16 Matthias Clasen + + * gtk/Makefile.am: Make folder, user-home and user-desktop links + to gtk-directory in the builtin icon theme, so that we can + use these icon names without risk of ending up without an icon. + 2008-06-16 Tor Lillqvist Bug 538362 - Get Win32 icons back in the file chooser diff --git a/gtk/Makefile.am b/gtk/Makefile.am index f44999ae00..a6739f73a1 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1158,6 +1158,9 @@ GENERATED_ICONS = \ stock-icons/16/gtk-media-previous-rtl.png \ stock-icons/16/gtk-media-rewind-rtl.png \ stock-icons/16/gtk-save.png \ + stock-icons/16/folder.png \ + stock-icons/16/user-home.png \ + stock-icons/16/user-desktop.png \ stock-icons/24/gtk-go-back-rtl.png \ stock-icons/24/gtk-go-forward-rtl.png \ stock-icons/24/gtk-goto-first-rtl.png \ @@ -1166,7 +1169,10 @@ GENERATED_ICONS = \ stock-icons/24/gtk-media-next-rtl.png \ stock-icons/24/gtk-media-previous-rtl.png \ stock-icons/24/gtk-media-rewind-rtl.png \ - stock-icons/24/gtk-save.png + stock-icons/24/gtk-save.png \ + stock-icons/24/folder.png \ + stock-icons/24/user-home.png \ + stock-icons/24/user-desktop.png # need to copy the icons so that we can replace the generated ones with # symlinks, even in the readonly srcdir case @@ -1199,8 +1205,14 @@ stamp-icons: $(STOCK_ICONS) && $(RM) gtk-media-rewind-rtl.png \ && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png\ && $(RM) gtk-save.png \ - && $(LN_S) gtk-floppy.png gtk-save.png) \ - done \ + && $(LN_S) gtk-floppy.png gtk-save.png \ + && $(RM) folder.png \ + && $(LN_S) gtk-directory.png folder.png \ + && $(RM) user-home.png \ + && $(LN_S) gtk-directory.png user-home.png \ + && $(RM) user-desktop.png \ + && $(LN_S) gtk-directory.png user-desktop.png \ + ) done \ && touch stamp-icons if CROSS_COMPILING