diff options
| author | Andy Hertzfeld <andy@src.gnome.org> | 2000-09-24 02:01:09 +0000 |
|---|---|---|
| committer | Andy Hertzfeld <andy@src.gnome.org> | 2000-09-24 02:01:09 +0000 |
| commit | 4f9e7f2b4d16b2a58521c9348e61e6a623f0360f (patch) | |
| tree | 5ff0d3dca08df32fc0ddcc0046b3365eec0d0539 | |
| parent | fd4ad0f58ebd77deac3ad1bc7a8189a0497ea6dc (diff) | |
| download | nautilus-4f9e7f2b4d16b2a58521c9348e61e6a623f0360f.tar.gz | |
fixed bug where toolbar icon theme indirection was broken, so now the new
fixed bug where toolbar icon theme indirection was broken,
so now the new ardmore theme uses the blue toolbar icons like
Susan intended.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/nautilus-window-toolbars.c | 15 |
2 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2000-09-23 Andy Hertzfeld <andy@eazel.com> + + * src/nautilus-window-toolbars.c: (set_up_button): + fixed bug where toolbar icon theme indirection was broken, + so now the new ardmore theme uses the blue toolbar icons like + Susan intended. + 2000-09-23 Josh Barrow <linuxfan@ionet.net> * libnautilus-extensions/nautilus-gnome-extensions.c: diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c index 0b36c1bfc..82282c258 100644 --- a/src/nautilus-window-toolbars.c +++ b/src/nautilus-window-toolbars.c @@ -35,6 +35,7 @@ #include "nautilus-window.h" #include <gnome.h> #include <libnautilus-extensions/nautilus-bookmark.h> +#include <libnautilus-extensions/nautilus-file-utilities.h> #include <libnautilus-extensions/nautilus-global-preferences.h> #include <libnautilus-extensions/nautilus-gtk-extensions.h> #include <libnautilus-extensions/nautilus-gnome-extensions.h> @@ -281,10 +282,20 @@ set_up_button (GtkWidget* button, const char *icon_name) { GnomeStock *stock_widget; - char *full_name; + char *full_name, *icon_theme, *path_name; GtkToolbarChild *toolbar_child; - full_name = nautilus_theme_get_image_path (icon_name); + /* look in the theme to see if there's a redirection found */ + icon_theme = nautilus_theme_get_theme_data ("toolbar", "ICON_THEME"); + if (icon_theme) { + path_name = g_strdup_printf ("%s/%s.png", icon_theme, icon_name); + full_name = nautilus_pixmap_file (path_name); + g_free (path_name); + g_free (icon_theme); + } else { + full_name = nautilus_theme_get_image_path (icon_name); + } + if (full_name == NULL) { full_name = g_strdup (icon_name); } |