# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1412365916 -10800
# Node ID 65c2d146ec2c9d96c497ee938d2400c234915445
# Parent  c74472caabee3656b7b0a8b5370e7f617340b7be
gtk+: undo wrong symlinks.

diff -r c74472caabee -r 65c2d146ec2c gtk+/receipt
--- a/gtk+/receipt	Fri Oct 03 18:49:40 2014 +0200
+++ b/gtk+/receipt	Fri Oct 03 22:51:56 2014 +0300
@@ -41,6 +41,8 @@
 compile_rules()
 {
 	. $stuff/replace-icons; cd $src
+	patch -p0 < $stuff/undo_gen_icons.patch
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
diff -r c74472caabee -r 65c2d146ec2c gtk+/stuff/replace-icons
--- a/gtk+/stuff/replace-icons	Fri Oct 03 18:49:40 2014 +0200
+++ b/gtk+/stuff/replace-icons	Fri Oct 03 22:51:56 2014 +0300
@@ -1,12 +1,9 @@
-# GTK+ stock icons looks alienly for SliTaz based on Faenza icon theme.
-# These icons takes place, and we don't use them.
-# This script replaces GTK+ stock icons by Faenza icons.
+# Replace GTK+ stock icons by Faenza icons
+# in order to strip icon theme and save some space.
 
-# All "-rtl" variants of icons are just mirrored horizontally original icons.
-# "media-seek-backward" and "media-seek-forward" composed from "media-palyback"
-# icon using the GIMP.
+echo -n "Replacing icons... "
 
-F=$WOK/faenza-icon-theme/taz/*/fs/usr/share/icons/Faenza
+F=/usr/share/icons/Faenza
 
 Ac16=$F/actions/16
 De16=$F/devices/16
@@ -287,7 +284,11 @@
 cp -f $St48/dialog-question.png .
 cp -f $St48/dialog-warning.png .
 
+echo "Done"
+
 for folder in 16 20 24 32 48; do
+	echo -n "Optimizing folder icons $folder... "
 	cd $src/gtk/stock-icons/$folder
 	optipng -quiet -o7 -zm1-9 ./*
+	echo "Done"
 done
diff -r c74472caabee -r 65c2d146ec2c gtk+/stuff/revert-iconview.patch
--- a/gtk+/stuff/revert-iconview.patch	Fri Oct 03 18:49:40 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Wed, 16 Nov 2011 22:38:45 +0000
-Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel"
-
-It makes GtkIconView segfault on GTK 2.24.
-
-gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
-there's a layout queued anyway, so we wouldn't end up in the same
-situation causing the crash the original patch is supposed to fix.
-
-This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663138
----
-diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
-index 62877fa..54b3f3b 100644
---- a/gtk/gtkiconview.c
-+++ b/gtk/gtkiconview.c
-@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
-
-       gtk_icon_view_build_items (icon_view);
-
--      gtk_icon_view_layout (icon_view);
-+      gtk_icon_view_queue_layout (icon_view);
-     }
-
-   g_object_notify (G_OBJECT (icon_view), "model");
---
-cgit v0.9.0.2
diff -r c74472caabee -r 65c2d146ec2c gtk+/stuff/undo_gen_icons.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk+/stuff/undo_gen_icons.patch	Fri Oct 03 22:51:56 2014 +0300
@@ -0,0 +1,24 @@
+--- gtk/Makefile.am
++++ gtk/Makefile.am
+@@ -1357,10 +1357,6 @@
+         fi &&								\
+ 	for i in 16 24; do						\
+ 	   (cd stock-icons/$$i						\
+-	   && $(RM) document-save.png 					\
+-	   && $(LN_S) media-floppy.png document-save.png 		\
+-	   && $(RM) folder-remote.png 					\
+-	   && $(LN_S) folder.png folder-remote.png 			\
+ 	   && $(RM) go-first-rtl.png 					\
+ 	   && $(LN_S) go-last-ltr.png go-first-rtl.png 			\
+ 	   && $(RM) go-last-rtl.png 					\
+@@ -1377,10 +1373,6 @@
+ 	   && $(LN_S) media-skip-forward-ltr.png media-skip-backward-rtl.png \
+ 	   && $(RM) media-skip-forward-rtl.png 				\
+ 	   && $(LN_S) media-skip-backward-ltr.png media-skip-forward-rtl.png \
+-	   && $(RM) user-desktop.png 					\
+-	   && $(LN_S) folder.png user-desktop.png 			\
+-	   && $(RM) user-home.png 					\
+-	   && $(LN_S) folder.png user-home.png 				\
+ 	) done 								\
+ 	&& touch stamp-icons
+