summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-07-02 22:44:09 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-07-02 22:44:09 +0000
commita72aed4ea22a9951742919e00ed7c47f14731001 (patch)
tree12895bf9e410e1c6e01bf64918ad563a5c80c11c /gdk
parent8982aa6723155a73976a0ad4ef00c1c68e886d3f (diff)
downloadgtk+-a72aed4ea22a9951742919e00ed7c47f14731001.tar.gz
Implement a loader for named themed icon based on from gnome-desktop
Wed Jul 2 18:00:56 2003 Owen Taylor <otaylor@redhat.com> * gtk/gtkicontheme.[ch]: Implement a loader for named themed icon based on from gnome-desktop library by Alex Larsson. * gtk/gtkiconthemeparser.[ch]: .ini file parsing code from gnome-desktop. * gtk/gtkiconfactory.[ch]: Add gtk_icon_source_set/get_icon_name() to allow stock icons to be based off of named theme icons. * gtk/gtkiconfactory.c: Rework sources so that the source is *either* a pixbuf, or a filename, or an icon name, instead of the pixbuf/filename mix it was before. Put a workaround for get_pixbuf() so that it can return the filename pixbuf, e.g, for render_icon(). * gtk/gtkiconfactory.c: Make the default setup use themed icons, and add builtin icons to the default icon theme for all the standard pixbufs, so we don't rely on actually having an icon theme on disk. * gtk/gtkrc.c: Add support for @"icon-name" to specify a themed icon for a stock icon source. * tests/Makefile.am test/testicontheme.c: Add a test program from gnome-desktop. * gdk/x11/gdkevents-x11.c gtk/gtksettings.c: Add Net/IconThemeName / gtk-icon-theme-name setting. * gtk/gtkiconfactory.c (ensure_cache_up_to_date): Actually update the icon cache serial so we don't continually * gtk/gtkwidget.c: Fix a couple of references in doc comments to ::direction_set that should have been to ::direction-changed
Diffstat (limited to 'gdk')
-rw-r--r--gdk/x11/gdkevents-x11.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 4da85c7560..7bb9d63d7c 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -2484,7 +2484,8 @@ static struct
{ "Gtk/IMStatusStyle", "gtk-im-status-style" },
{ "Net/CursorBlink", "gtk-cursor-blink" },
{ "Net/CursorBlinkTime", "gtk-cursor-blink-time" },
- { "Net/ThemeName", "gtk-theme-name" }
+ { "Net/ThemeName", "gtk-theme-name" },
+ { "Net/IconThemeName", "gtk-icon-theme-name" },
};
static void