summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--components/hardware/nautilus-hardware-view.c4
-rw-r--r--icons/Makefile.am1
-rw-r--r--icons/i-blockdev.pngbin23706 -> 3345 bytes
-rw-r--r--icons/i-harddisk.pngbin0 -> 10481 bytes
5 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 69a7738d0..f471d7a9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2000-11-02 Andy Hertzfeld <andy@eazel.com>
+
+ fixed problem where I accidentally changed the icons for disk
+ drives that appear on the desktop when I only meant to change
+ the hardware view. Fixed by restoring the old icon, and using
+ one with a different name in the hardware view.
+
+ * components/hardware/nautilus-hardware-view.c:
+ (setup_overview_form):
+ use "i-harddrive.png" instead of "i-blockdev.png"
+
+ * icons/Makefile.am:
+ * icons/i-blockdev.png:
+ * icons/i-harddrive.png:
+ restored the old block device icon and added a new hard drive one.
+
2000-11-02 Ramiro Estrugo <ramiro@eazel.com>
* components/notes/nautilus-notes.c: (finish_loading_note),
diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c
index e7b477b9b..651a564a7 100644
--- a/components/hardware/nautilus-hardware-view.c
+++ b/components/hardware/nautilus-hardware-view.c
@@ -459,12 +459,12 @@ static void setup_overview_form (NautilusHardwareView *view)
/* Set the icon depending on the type of device */
if(!strcmp(ide_media, "disk\n")) {
- file_name = nautilus_pixmap_file("i-blockdev.png");
+ file_name = nautilus_pixmap_file("i-harddisk.png");
} else if(!strcmp(ide_media, "cdrom\n")) {
file_name = nautilus_pixmap_file("CD_drive.png");
} else {
/* some other device ... still set an icon */
- file_name = nautilus_pixmap_file("i-blockdev.png");
+ file_name = nautilus_pixmap_file("i-harddisk.png");
}
pixmap_widget = GTK_WIDGET (gnome_pixmap_new_from_file(file_name));
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 3933fd8aa..e4a7961df 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -143,6 +143,7 @@ icon_DATA =\
i-executable.png \
i-fifo.png \
i-floppy.png \
+ i-harddisk.png \
i-music-aa.png \
i-music.png \
i-nfs.png \
diff --git a/icons/i-blockdev.png b/icons/i-blockdev.png
index 4a9516b0b..d840d4f64 100644
--- a/icons/i-blockdev.png
+++ b/icons/i-blockdev.png
Binary files differ
diff --git a/icons/i-harddisk.png b/icons/i-harddisk.png
new file mode 100644
index 000000000..633b79f24
--- /dev/null
+++ b/icons/i-harddisk.png
Binary files differ