Revert from "edit-preferences" to "gtk-preferences"

There is not a icon named "edit-preferences" in the spec
http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 80ebe5711288ebe4b1a4ac537d4f4454f97437e8..6a791e05ccdb980e4fff9a6afa984f5da3923124 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1041,7 +1041,7 @@ STOCK_ICONS = \
        stock-icons/16/document-open.png                \
        stock-icons/16/gtk-page-setup.png               \
        stock-icons/16/edit-paste.png                   \
-       stock-icons/16/edit-preferences.png             \
+       stock-icons/16/gtk-preferences.png              \
        stock-icons/16/document-print.png               \
        stock-icons/16/printer-error.png                \
        stock-icons/16/printer-paused.png               \
@@ -1151,7 +1151,7 @@ STOCK_ICONS = \
        stock-icons/24/gtk-orientation-portrait.png     \
        stock-icons/24/gtk-page-setup.png               \
        stock-icons/24/edit-paste.png                   \
-       stock-icons/24/edit-preferences.png             \
+       stock-icons/24/gtk-preferences.png              \
        stock-icons/24/document-print.png               \
        stock-icons/24/printer-error.png                \
        stock-icons/24/printer-paused.png               \

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index c5ae553a2ac964810c53ef6b1349d6eee3729dfe..5cd0f38cbb9c80ea0dc1080b552ccc5a04388d38 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -453,7 +453,7 @@ get_default_icons (GtkIconFactory *factory)
   register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE);
   register_stock_icon (factory, GTK_STOCK_PAGE_SETUP, GTK_STOCK_PAGE_SETUP);
   register_stock_icon (factory, GTK_STOCK_PASTE, "edit-paste");
-  register_stock_icon (factory, GTK_STOCK_PREFERENCES, "edit-preferences");
+  register_stock_icon (factory, GTK_STOCK_PREFERENCES, GTK_STOCK_PREFERENCES);
   register_stock_icon (factory, GTK_STOCK_PRINT, "document-print");
   register_stock_icon (factory, GTK_STOCK_PRINT_ERROR, "printer-error");
   register_stock_icon (factory, GTK_STOCK_PRINT_PAUSED, "printer-paused");

diff --git a/gtk/stock-icons/16/edit-preferences.png b/gtk/stock-icons/16/gtk-preferences.png
similarity index 100%
rename from gtk/stock-icons/16/edit-preferences.png
rename to gtk/stock-icons/16/gtk-preferences.png

diff --git a/gtk/stock-icons/16/edit-preferences.svg b/gtk/stock-icons/16/gtk-preferences.svg
similarity index 100%
rename from gtk/stock-icons/16/edit-preferences.svg
rename to gtk/stock-icons/16/gtk-preferences.svg

diff --git a/gtk/stock-icons/24/edit-preferences.png b/gtk/stock-icons/24/gtk-preferences.png
similarity index 100%
rename from gtk/stock-icons/24/edit-preferences.png
rename to gtk/stock-icons/24/gtk-preferences.png

diff --git a/gtk/stock-icons/24/edit-preferences.svg b/gtk/stock-icons/24/gtk-preferences.svg
similarity index 100%
rename from gtk/stock-icons/24/edit-preferences.svg
rename to gtk/stock-icons/24/gtk-preferences.svg