[gtk+] Use existing mime type for GTK_FILE stock icon
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Use existing mime type for GTK_FILE stock icon
- Date: Sun, 6 Mar 2011 05:32:15 +0000 (UTC)
commit 39d4207ab7ecedc0fce2e65478dbd5d152e23b65
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Mar 6 00:31:20 2011 -0500
Use existing mime type for GTK_FILE stock icon
document-x-generic is not actually a mimetype. Using text-x-generic
instead lets us work out-of-the-box in a11y themes.
gtk/Makefile.am | 6 ++----
gtk/gtkiconfactory.c | 2 +-
gtk/gtkrecentmanager.c | 2 +-
.../{document-x-generic.png => text-x-generic.png} | Bin 569 -> 569 bytes
.../{document-x-generic.svg => text-x-generic.svg} | 0
.../{document-x-generic.png => text-x-generic.png} | Bin 736 -> 736 bytes
.../{document-x-generic.svg => text-x-generic.svg} | 0
7 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d7f40c3..8274001 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1069,7 +1069,7 @@ STOCK_ICONS = \
stock-icons/16/gtk-disconnect.png \
stock-icons/16/gtk-edit.png \
stock-icons/16/system-run.png \
- stock-icons/16/document-x-generic.png \
+ stock-icons/16/text-x-generic.png \
stock-icons/16/edit-find-replace.png \
stock-icons/16/edit-find.png \
stock-icons/16/media-floppy.png \
@@ -1182,7 +1182,7 @@ STOCK_ICONS = \
stock-icons/24/gtk-disconnect.png \
stock-icons/24/gtk-edit.png \
stock-icons/24/system-run.png \
- stock-icons/24/document-x-generic.png \
+ stock-icons/24/text-x-generic.png \
stock-icons/24/edit-find-replace.png \
stock-icons/24/edit-find.png \
stock-icons/24/gtk-font.png \
@@ -1340,8 +1340,6 @@ stamp-icons: $(STOCK_ICONS)
&& $(LN_S) folder.png user-home.png \
&& $(RM) user-desktop.png \
&& $(LN_S) folder.png user-desktop.png \
- && $(RM) text-x-generic.png \
- && $(LN_S) document-x-generic.png text-x-generic.png \
) done \
&& touch stamp-icons
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index ddeae73..4e16bfb 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -481,7 +481,7 @@ get_default_icons (GtkIconFactory *factory)
register_bidi_stock_icon (factory, GTK_STOCK_UNDELETE, GTK_STOCK_UNDELETE);
register_bidi_stock_icon (factory, GTK_STOCK_UNDO, "edit-undo");
register_stock_icon (factory, GTK_STOCK_GO_UP, "go-up");
- register_stock_icon (factory, GTK_STOCK_FILE, "document-x-generic");
+ register_stock_icon (factory, GTK_STOCK_FILE, "text-x-generic");
register_stock_icon (factory, GTK_STOCK_DIRECTORY, "folder");
register_stock_icon (factory, GTK_STOCK_ABOUT, "help-about");
register_stock_icon (factory, GTK_STOCK_CONNECT, GTK_STOCK_CONNECT);
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 655e160..76bbf3f 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -1962,7 +1962,7 @@ gtk_recent_info_get_icon (GtkRecentInfo *info,
strcmp (info->mime_type, "x-directory/normal") == 0)
retval = get_icon_fallback ("folder", size);
else
- retval = get_icon_fallback ("document-x-generic", size);
+ retval = get_icon_fallback ("text-x-generic", size);
}
return retval;
diff --git a/gtk/stock-icons/16/document-x-generic.png b/gtk/stock-icons/16/text-x-generic.png
similarity index 100%
rename from gtk/stock-icons/16/document-x-generic.png
rename to gtk/stock-icons/16/text-x-generic.png
diff --git a/gtk/stock-icons/16/document-x-generic.svg b/gtk/stock-icons/16/text-x-generic.svg
similarity index 100%
rename from gtk/stock-icons/16/document-x-generic.svg
rename to gtk/stock-icons/16/text-x-generic.svg
diff --git a/gtk/stock-icons/24/document-x-generic.png b/gtk/stock-icons/24/text-x-generic.png
similarity index 100%
rename from gtk/stock-icons/24/document-x-generic.png
rename to gtk/stock-icons/24/text-x-generic.png
diff --git a/gtk/stock-icons/24/document-x-generic.svg b/gtk/stock-icons/24/text-x-generic.svg
similarity index 100%
rename from gtk/stock-icons/24/document-x-generic.svg
rename to gtk/stock-icons/24/text-x-generic.svg
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]