diff options
author | Alexander Larsson <alexl@redhat.com> | 2003-06-27 15:14:22 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@src.gnome.org> | 2003-06-27 15:14:22 +0000 |
commit | 0f758600b3f03bd7765d642647da9825c3f4e591 (patch) | |
tree | fe667a2a424b82d90f37f163201d16ac7c69c2ba /libnautilus-private/nautilus-desktop-link.c | |
parent | c2083b09fd202ea913ad3cd4a3ee299713767cf2 (diff) | |
download | nautilus-0f758600b3f03bd7765d642647da9825c3f4e591.tar.gz |
This is based on a patch by Jürg Billeter <j@bitron.ch> which was partly
2003-06-27 Alexander Larsson <alexl@redhat.com>
This is based on a patch by Jürg Billeter <j@bitron.ch> which was
partly based on a patch by Wolfgang Pichler <madmin@dialog-telekom.at>.
* components/tree/nautilus-tree-model.[ch]:
Support multiple roots. New row_loaded signal that gets fired when a
directory has been fully loaded. New font-weight column.
* components/tree/nautilus-tree-view.c:
Remove tree expansion.
Populate multiple roots: ~/, / and mounted removable media.
Tree follows view uri.
* libnautilus-private/nautilus-desktop-link-monitor.c:
(create_volume_link), (nautilus_desktop_link_monitor_init),
(desktop_link_monitor_finalize):
Kill black_list, its moved to nautilus-volume-manager.
* libnautilus-private/nautilus-desktop-link.c:
(nautilus_desktop_link_new_from_volume):
Move get_icon_for_volume to nautilus-volume-manager
* libnautilus-private/nautilus-tree-view-drag-dest.c:
(file_for_path), (get_drop_target):
Handle NULL for root_uri, meaning drops on the background
are not allowed.
* libnautilus-private/nautilus-volume-monitor.[ch]:
(nautilus_volume_get_icon),
(nautilus_volume_is_in_removable_blacklist):
Add get_icon and the removable media blacklist.
Diffstat (limited to 'libnautilus-private/nautilus-desktop-link.c')
-rw-r--r-- | libnautilus-private/nautilus-desktop-link.c | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c index 66eaa3a0b..e1ec5635e 100644 --- a/libnautilus-private/nautilus-desktop-link.c +++ b/libnautilus-private/nautilus-desktop-link.c @@ -161,52 +161,6 @@ nautilus_desktop_link_new (NautilusDesktopLinkType type) return link; } -static char * -get_icon_for_volume (const NautilusVolume *volume) -{ - char *icon_name; - - icon_name = "gnome-dev-harddisk"; - switch (nautilus_volume_get_device_type (volume)) { - case NAUTILUS_DEVICE_AUDIO_CD: - case NAUTILUS_DEVICE_CDROM_DRIVE: - icon_name = "gnome-dev-cdrom"; - break; - - case NAUTILUS_DEVICE_FLOPPY_DRIVE: - icon_name = "gnome-dev-floppy"; - break; - - case NAUTILUS_DEVICE_JAZ_DRIVE: - icon_name = "gnome-dev-jazdisk"; - break; - - case NAUTILUS_DEVICE_MEMORY_STICK: - icon_name = "gnome-dev-memory"; - break; - - case NAUTILUS_DEVICE_NFS: - icon_name = "gnome-fs-nfs"; - break; - - case NAUTILUS_DEVICE_SMB: - icon_name = "gnome-fs-smb"; - break; - - case NAUTILUS_DEVICE_ZIP_DRIVE: - icon_name = "gnome-dev-zipdisk"; - break; - - case NAUTILUS_DEVICE_APPLE: - case NAUTILUS_DEVICE_WINDOWS: - case NAUTILUS_DEVICE_CAMERA: - case NAUTILUS_DEVICE_UNKNOWN: - break; - } - - return g_strdup (icon_name); -} - NautilusDesktopLink * nautilus_desktop_link_new_from_volume (const NautilusVolume *volume) { @@ -239,7 +193,7 @@ nautilus_desktop_link_new_from_volume (const NautilusVolume *volume) link->details->display_name = nautilus_volume_get_name (volume); link->details->activation_uri = nautilus_volume_get_target_uri (volume); - link->details->icon = get_icon_for_volume (volume); + link->details->icon = nautilus_volume_get_icon (volume); create_icon_file (link); |