diff options
| author | Dave Camp <dave@ximian.com> | 2002-07-28 03:06:25 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2002-07-28 03:06:25 +0000 |
| commit | 6d68b5844d539da5c711ca1742f705fa3595116d (patch) | |
| tree | 437dc0f2610d7c28ea1d039b64e4b75653aeb4de /libnautilus-private/nautilus-icon-factory.c | |
| parent | a3e16c32825f834e1e10e139f244a5a94cba1030 (diff) | |
| download | nautilus-6d68b5844d539da5c711ca1742f705fa3595116d.tar.gz | |
Fixed a problem where shortcutting || was preventing the fallback theme
2002-07-27 Dave Camp <dave@ximian.com>
* libnautilus-private/nautilus-icon-factory.c
(icon_theme_changed_callback): Fixed a problem where shortcutting
|| was preventing the fallback theme from being set. Fixes
#89178.
Diffstat (limited to 'libnautilus-private/nautilus-icon-factory.c')
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 722bfff92..5ff4a8c9e 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -858,6 +858,7 @@ icon_theme_changed_callback (gpointer user_data) { char *icon_theme, *icon_fallback_theme; NautilusIconFactory *factory; + gboolean changed; icon_theme = nautilus_theme_get_theme_data ("icons", "icon_theme"); if (icon_theme == NULL) { @@ -871,9 +872,10 @@ icon_theme_changed_callback (gpointer user_data) factory = get_icon_factory (); - if (nautilus_icon_theme_set_names (factory->theme.current, icon_theme) || - nautilus_icon_theme_set_names (factory->theme.fallback, icon_fallback_theme)) { - + changed = nautilus_icon_theme_set_names (factory->theme.current, icon_theme); + changed |= nautilus_icon_theme_set_names (factory->theme.fallback, icon_fallback_theme); + + if (changed) { nautilus_icon_factory_clear (); load_thumbnail_frame (factory); g_signal_emit (factory, |