summaryrefslogtreecommitdiff
path: root/icons
diff options
context:
space:
mode:
authorAlex Larsson <alexl@redhat.com>2001-09-11 01:20:43 +0000
committerAlexander Larsson <alexl@src.gnome.org>2001-09-11 01:20:43 +0000
commitede19226c50a448d0b64711b46c2f2072ee1963e (patch)
tree525a9532b9da2da409d970c542d748aceb930a49 /icons
parentffaa43d0eb9da4b4235072859e45c3aeea896f48 (diff)
downloadnautilus-ede19226c50a448d0b64711b46c2f2072ee1963e.tar.gz
Merge some stuff from the redhat-outstanding-patches branch
2001-09-05 Alex Larsson <alexl@redhat.com> Merge some stuff from the redhat-outstanding-patches branch * eazel-logos/default.xml: * icons/default.xml: don't hardcode the title, title info, and shadow colors; this prevented the auto-color-selection stuff in nautilus-sidebar-title.c from working properly. And the hardcoded values were the same thing the autoselector would have chosen anyhow. * libnautilus-private/nautilus-monitor.c: Don't monitor files on read only volumes, they never change, and will keep cdroms from being unmounted because fam has open file descriptors on them. * libnautilus-private/nautilus-thumbnails.c: Always look for local thumbnails first. * libnautilus-private/nautilus-volume-monitor.[ch]: Add nautilus_volume_is_read_only() and nautilus_volume_monitor_get_volume_for_path() * src/nautilus-desktop-window.c: (set_wmspec_desktop_hint): function to set _NET_WM_WINDOW_TYPE, to avoid confusing kwin so badly, and also to go ahead and support the Window Manager Hints Of The Future. (set_gdk_window_background): only set root background to a pixel if we retrieved a pixel property (map): Set background of our child widgets in addition to our own background. This gets rid of the last of the ugliness during Nautilus startup, I believe. * src/file-manager/fm-icon-view.c: Don't read GMC position meta data -- it is never right for nautilus, due to different size icons, additional icons, different placement policies, so falling back to normal automatic placement works better.
Diffstat (limited to 'icons')
-rw-r--r--icons/default.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/icons/default.xml b/icons/default.xml
index bc4be92a4..c5e242a2a 100644
--- a/icons/default.xml
+++ b/icons/default.xml
@@ -4,9 +4,6 @@
<sidebar sidebar_background_tile_image="./side_bar_image.png"
sidebar_background_color="rgb:4747/4A4A/7C7C-rgb:2222/2323/3A3A:h"
- title_color="rgb:FFFF/FFFF/FFFF"
- title_info_color="rgb:FFFF/FFFF/FFFF"
- title_shadow_color="rgb:0000/0000/0000"
tab_piece_images="sidebar_tab_pieces" combine="true"
left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="rgb:FFFF/FFFF/FFFF"
tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />