diff options
| author | Seth Nickell <snickell@stanford.edu> | 2002-01-22 19:51:22 +0000 |
|---|---|---|
| committer | Seth Nickell <seth@src.gnome.org> | 2002-01-22 19:51:22 +0000 |
| commit | 4e7d73157993fec37586de37cb0311bdf5837a4b (patch) | |
| tree | a1d79e91194e9f225583809b637ddb79b40a3959 | |
| parent | bec08795932c50b5f54d16012acc795e6937580f (diff) | |
| download | nautilus-4e7d73157993fec37586de37cb0311bdf5837a4b.tar.gz | |
Seperate document icons from the themes so they can be moved into
2002-01-22 Seth Nickell <snickell@stanford.edu>
Seperate document icons from the themes so they
can be moved into gnome-mime-data and used by
other applications more cleanly.
* configure.in:
* icons/Makefile.am:
* icons/default.xml:
* icons/default/.cvsignore:
* icons/default/Back.png:
* icons/default/Forward.png:
* icons/default/Home.png:
* icons/default/Makefile:
* icons/default/Makefile.am:
* icons/default/Makefile.in:
* icons/default/Refresh.png:
* icons/default/Search.png:
* icons/default/SearchWeb.png:
* icons/default/Stop.png:
* icons/default/Up.png:
* icons/default/decrement.png:
* icons/default/default.xml:
* icons/default/home.png:
* icons/default/i-bookmark-20.png:
* icons/default/i-bookmark-missing-20.png:
* icons/default/i-bookmark-missing.png:
* icons/default/i-bookmark.png:
* icons/default/i-broken-image.png:
* icons/default/i-directory-12.png:
* icons/default/i-directory-24.png:
* icons/default/i-directory-36.png:
* icons/default/i-directory-72.png:
* icons/default/i-directory-96.png:
* icons/default/i-directory-accept-12.png:
* icons/default/i-directory-accept-24.png:
* icons/default/i-directory-accept-36.png:
* icons/default/i-directory-accept-72.png:
* icons/default/i-directory-accept-96.png:
* icons/default/i-directory-accept.png:
* icons/default/i-directory-accept.xml:
* icons/default/i-directory.png:
* icons/default/i-directory.xml:
* icons/default/i-regular-12.png:
* icons/default/i-regular-24.png:
* icons/default/i-regular-36.png:
* icons/default/i-regular-72.png:
* icons/default/i-regular-96.png:
* icons/default/i-regular.png:
* icons/default/i-regular.xml:
* icons/default/i-search-72.png:
* icons/default/i-spreadsheet.png:
* icons/default/i-stalled.png:
* icons/default/i-symlink.png:
* icons/default/i-web-72.png:
* icons/default/increment.png:
* icons/default/loading.png:
* icons/default/manual.png:
* icons/default/number_strip.png:
* icons/default/side_bar_image.png:
* icons/default/temp-home.png:
* icons/default/theme_preview.png:
* icons/default/trash-empty.png:
* icons/default/trash-full.png:
* icons/default/zoom_body.png:
Move default theme from icons/ into icons/default.
* icons/gnome-application-encapsulated_postscript.png:
* icons/gnome-application-pdf-192.png:
* icons/gnome-application-pdf.png:
* icons/gnome-application-pgp-192.png:
* icons/gnome-application-pgp.png:
* icons/gnome-application-postscript-192.png:
* icons/gnome-application-postscript-72.png:
* icons/gnome-application-postscript-96.png:
* icons/gnome-application-postscript.png:
* icons/gnome-application-x-c-header.png:
* icons/gnome-application-x-c-source.png:
* icons/gnome-application-x-cc-source.png:
* icons/gnome-application-x-e-theme.png:
* icons/gnome-application-x-generic-spreadsheet.png:
* icons/gnome-application-x-gnome-app-info.png:
* icons/gnome-application-x-java-source.png:
* icons/gnome-application-x-kde-app-info.png:
* icons/gnome-application-x-php.png:
* icons/gnome-application-x-reject.png:
* icons/gnome-application-x-scheme-source.png:
* icons/gnome-application-x-sql.png:
* icons/gnome-audio-basic.png:
* icons/gnome-audio-midi.png:
* icons/gnome-audio-ulaw.png:
* icons/gnome-audio-x-aiff.png:
* icons/gnome-audio-x-mod-192.png:
* icons/gnome-audio-x-mod.png:
* icons/gnome-audio-x-mp3-192.png:
* icons/gnome-audio-x-mp3.png:
* icons/gnome-audio-x-ogg-192.png:
* icons/gnome-audio-x-ogg.png:
* icons/gnome-audio-x-pn-realaudio.png:
* icons/gnome-audio-x-real-192.png:
* icons/gnome-audio-x-s3m-192.png:
* icons/gnome-audio-x-s3m.png:
* icons/gnome-audio-x-stm-192.png:
* icons/gnome-audio-x-stm.png:
* icons/gnome-audio-x-voc.png:
* icons/gnome-audio-x-wav.png:
* icons/gnome-audio-x-xi-192.png:
* icons/gnome-audio-x-xi.png:
* icons/gnome-audio-x-xm.png:
* icons/gnome-audio.png:
* icons/gnome-compressed-192.png:
* icons/gnome-compressed.png:
* icons/gnome-core.png:
* icons/gnome-emacs-192.png:
* icons/gnome-font-afm.png:
* icons/gnome-font-ttf.png:
* icons/gnome-font-x-pcf.png:
* icons/gnome-gimp.png:
* icons/gnome-gnumeric.png:
* icons/gnome-http-url.png:
* icons/gnome-image-bmp.png:
* icons/gnome-image-generic.png:
* icons/gnome-image-gif.png:
* icons/gnome-image-ief.png:
* icons/gnome-image-jpeg.png:
* icons/gnome-image-pbm.png:
* icons/gnome-image-pgm.png:
* icons/gnome-image-png.png:
* icons/gnome-image-pnm.png:
* icons/gnome-image-ppm.png:
* icons/gnome-image-psd.png:
* icons/gnome-image-ras.png:
* icons/gnome-image-rgb.png:
* icons/gnome-image-tga.png:
* icons/gnome-image-tiff.png:
* icons/gnome-image-x-xfig.png:
* icons/gnome-image-xbm.png:
* icons/gnome-image-xcf.png:
* icons/gnome-image-xpm.png:
* icons/gnome-image-xwd.png:
* icons/gnome-library.png:
* icons/gnome-manpage.png:
* icons/gnome-objectfile.png:
* icons/gnome-pack-deb.png:
* icons/gnome-pack-rpm.png:
* icons/gnome-package.png:
* icons/gnome-tex-192.png:
* icons/gnome-tex.png:
* icons/gnome-text-html-192.png:
* icons/gnome-text-html.png:
* icons/gnome-text-x-authors.png:
* icons/gnome-text-x-copying.png:
* icons/gnome-text-x-credits.png:
* icons/gnome-text-x-install.png:
* icons/gnome-text-x-makefile-192.png:
* icons/gnome-text-x-makefile.png:
* icons/gnome-text-x-readme.png:
* icons/gnome-textfile.png:
* icons/gnome-video-mpeg.png:
* icons/gnome-video-quicktime.png:
* icons/gnome-video-x-msvideo.png:
* icons/gnome-word-192.png:
* icons/i-blockdev.png:
* icons/i-bookmark-20.png:
* icons/i-bookmark-missing-20.png:
* icons/i-bookmark-missing.png:
* icons/i-bookmark.png:
* icons/i-broken-image.png:
* icons/i-cdrom-192.png:
* icons/i-cdrom.png:
* icons/i-chardev.png:
* icons/i-core.png:
* icons/i-device.png:
* icons/i-dirclosed.png:
* icons/i-directory-12.png:
* icons/i-directory-24.png:
* icons/i-directory-36.png:
* icons/i-directory-72.png:
* icons/i-directory-96.png:
* icons/i-directory-accept-12.png:
* icons/i-directory-accept-24.png:
* icons/i-directory-accept-36.png:
* icons/i-directory-accept-72.png:
* icons/i-directory-accept-96.png:
* icons/i-directory-accept.png:
* icons/i-directory-accept.xml:
* icons/i-directory.png:
* icons/i-directory.xml:
* icons/i-executable.png:
* icons/i-fifo.png:
* icons/i-floppy.png:
* icons/i-harddisk.png:
* icons/i-music-12.png:
* icons/i-music-24.png:
* icons/i-music-36.png:
* icons/i-music.png:
* icons/i-nfs.png:
* icons/i-printer.png:
* icons/i-regular-12.png:
* icons/i-regular-24.png:
* icons/i-regular-36.png:
* icons/i-regular-72.png:
* icons/i-regular-96.png:
* icons/i-regular.png:
* icons/i-regular.xml:
* icons/i-search-72.png:
* icons/i-sock.png:
* icons/i-spreadsheet.png:
* icons/i-stalled.png:
* icons/i-symlink.png:
* icons/i-web-72.png:
* icons/i-zip.png:
* icons/i-zipdisk.png:
* icons/i-zipdisk2.png:
* icons/loading.png:
* icons/manual.png:
* icons/temp-home.png:
* icons/trash-empty.png:
* icons/trash-full.png:
Move icons to either gnome-mime-data/icons or, perhaps,
nautilus/icons/default
* libnautilus-private/nautilus-find-icon-image.c:
(make_full_icon_path), (get_themed_icon_file_path),
(nautilus_get_icon_file_name):
Add support for looking in DATADIR/share/pixmaps/document-icons
as a fallback for the current theme and the fallback theme.
Remove hardcoded "default" theme stuff.
* libnautilus-private/nautilus-icon-factory.c:
(icon_theme_changed_callback):
If a theme doesn't have a fallback theme listed, use the
"default" theme as the fallback. Should be the only default
theme hardcoding left.
* libnautilus-private/nautilus-theme.c: (load_theme_document),
(nautilus_theme_get_theme_data_from_theme),
(nautilus_theme_get_image_path_from_theme),
(nautilus_theme_make_preview_pixbuf), (has_image_file),
(theme_get_property), (nautilus_theme_for_each_theme):
Remove hardcoding of default theme.
* icons/crux_eggplant/crux_eggplant.xml:
Remove inheritance clause which was pointing to "arlo",
a theme which does not exist anymore.
| -rw-r--r-- | ChangeLog | 254 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | icons/Makefile.am | 131 | ||||
| -rw-r--r-- | icons/crux_eggplant/crux_eggplant.xml | 1 | ||||
| -rw-r--r-- | icons/default/.cvsignore | 2 | ||||
| -rw-r--r-- | icons/default/Back.png | bin | 0 -> 287 bytes | |||
| -rw-r--r-- | icons/default/Forward.png | bin | 0 -> 288 bytes | |||
| -rw-r--r-- | icons/default/Home.png | bin | 0 -> 385 bytes | |||
| -rw-r--r-- | icons/default/Makefile | 385 | ||||
| -rw-r--r-- | icons/default/Makefile.am | 63 | ||||
| -rw-r--r-- | icons/default/Makefile.in | 385 | ||||
| -rw-r--r-- | icons/default/Refresh.png | bin | 0 -> 341 bytes | |||
| -rw-r--r-- | icons/default/Search.png | bin | 0 -> 597 bytes | |||
| -rw-r--r-- | icons/default/SearchWeb.png | bin | 0 -> 1013 bytes | |||
| -rw-r--r-- | icons/default/Stop.png | bin | 0 -> 387 bytes | |||
| -rw-r--r-- | icons/default/Up.png | bin | 0 -> 316 bytes | |||
| -rw-r--r-- | icons/default/decrement.png | bin | 0 -> 258 bytes | |||
| -rw-r--r-- | icons/default/default.xml (renamed from icons/default.xml) | 2 | ||||
| -rw-r--r-- | icons/default/home.png | bin | 0 -> 190 bytes | |||
| -rw-r--r-- | icons/default/i-bookmark-20.png (renamed from icons/i-bookmark-20.png) | bin | 878 -> 878 bytes | |||
| -rw-r--r-- | icons/default/i-bookmark-missing-20.png (renamed from icons/i-bookmark-missing-20.png) | bin | 834 -> 834 bytes | |||
| -rw-r--r-- | icons/default/i-bookmark-missing.png (renamed from icons/i-bookmark-missing.png) | bin | 834 -> 834 bytes | |||
| -rw-r--r-- | icons/default/i-bookmark.png (renamed from icons/i-bookmark.png) | bin | 878 -> 878 bytes | |||
| -rw-r--r-- | icons/default/i-broken-image.png (renamed from icons/i-broken-image.png) | bin | 5900 -> 5900 bytes | |||
| -rw-r--r-- | icons/default/i-directory-12.png (renamed from icons/i-directory-12.png) | bin | 459 -> 459 bytes | |||
| -rw-r--r-- | icons/default/i-directory-24.png (renamed from icons/i-directory-24.png) | bin | 927 -> 927 bytes | |||
| -rw-r--r-- | icons/default/i-directory-36.png (renamed from icons/i-directory-36.png) | bin | 1287 -> 1287 bytes | |||
| -rw-r--r-- | icons/default/i-directory-72.png (renamed from icons/i-directory-72.png) | bin | 1998 -> 1998 bytes | |||
| -rw-r--r-- | icons/default/i-directory-96.png (renamed from icons/i-directory-96.png) | bin | 2656 -> 2656 bytes | |||
| -rw-r--r-- | icons/default/i-directory-accept-12.png (renamed from icons/i-directory-accept-12.png) | bin | 476 -> 476 bytes | |||
| -rw-r--r-- | icons/default/i-directory-accept-24.png (renamed from icons/i-directory-accept-24.png) | bin | 1003 -> 1003 bytes | |||
| -rw-r--r-- | icons/default/i-directory-accept-36.png (renamed from icons/i-directory-accept-36.png) | bin | 1343 -> 1343 bytes | |||
| -rw-r--r-- | icons/default/i-directory-accept-72.png (renamed from icons/i-directory-accept-72.png) | bin | 2072 -> 2072 bytes | |||
| -rw-r--r-- | icons/default/i-directory-accept-96.png (renamed from icons/i-directory-accept-96.png) | bin | 2510 -> 2510 bytes | |||
| -rw-r--r-- | icons/default/i-directory-accept.png (renamed from icons/i-directory-accept.png) | bin | 1435 -> 1435 bytes | |||
| -rw-r--r-- | icons/default/i-directory-accept.xml (renamed from icons/i-directory-accept.xml) | 0 | ||||
| -rw-r--r-- | icons/default/i-directory.png (renamed from icons/i-directory.png) | bin | 1295 -> 1295 bytes | |||
| -rw-r--r-- | icons/default/i-directory.xml (renamed from icons/i-directory.xml) | 0 | ||||
| -rw-r--r-- | icons/default/i-regular-12.png (renamed from icons/i-regular-12.png) | bin | 597 -> 597 bytes | |||
| -rw-r--r-- | icons/default/i-regular-24.png (renamed from icons/i-regular-24.png) | bin | 951 -> 951 bytes | |||
| -rw-r--r-- | icons/default/i-regular-36.png (renamed from icons/i-regular-36.png) | bin | 1549 -> 1549 bytes | |||
| -rw-r--r-- | icons/default/i-regular-72.png (renamed from icons/i-regular-72.png) | bin | 3630 -> 3630 bytes | |||
| -rw-r--r-- | icons/default/i-regular-96.png (renamed from icons/i-regular-96.png) | bin | 6716 -> 6716 bytes | |||
| -rw-r--r-- | icons/default/i-regular.png (renamed from icons/i-regular.png) | bin | 2181 -> 2181 bytes | |||
| -rw-r--r-- | icons/default/i-regular.xml (renamed from icons/i-regular.xml) | 0 | ||||
| -rw-r--r-- | icons/default/i-search-72.png (renamed from icons/i-search-72.png) | bin | 6904 -> 6904 bytes | |||
| -rw-r--r-- | icons/default/i-spreadsheet.png (renamed from icons/i-spreadsheet.png) | bin | 2561 -> 2561 bytes | |||
| -rw-r--r-- | icons/default/i-stalled.png (renamed from icons/i-stalled.png) | bin | 154 -> 154 bytes | |||
| -rw-r--r-- | icons/default/i-symlink.png (renamed from icons/i-symlink.png) | bin | 3656 -> 3656 bytes | |||
| -rw-r--r-- | icons/default/i-web-72.png (renamed from icons/i-web-72.png) | bin | 10963 -> 10963 bytes | |||
| -rw-r--r-- | icons/default/increment.png | bin | 0 -> 364 bytes | |||
| -rw-r--r-- | icons/default/loading.png (renamed from icons/loading.png) | bin | 4446 -> 4446 bytes | |||
| -rw-r--r-- | icons/default/manual.png (renamed from icons/manual.png) | bin | 2757 -> 2757 bytes | |||
| -rw-r--r-- | icons/default/number_strip.png | bin | 0 -> 398 bytes | |||
| -rw-r--r-- | icons/default/side_bar_image.png | bin | 0 -> 495 bytes | |||
| -rw-r--r-- | icons/default/temp-home.png (renamed from icons/temp-home.png) | bin | 5949 -> 5949 bytes | |||
| -rw-r--r-- | icons/default/theme_preview.png | bin | 0 -> 3204 bytes | |||
| -rw-r--r-- | icons/default/trash-empty.png (renamed from icons/trash-empty.png) | bin | 4754 -> 4754 bytes | |||
| -rw-r--r-- | icons/default/trash-full.png (renamed from icons/trash-full.png) | bin | 5406 -> 5406 bytes | |||
| -rw-r--r-- | icons/default/zoom_body.png | bin | 0 -> 1379 bytes | |||
| -rw-r--r-- | icons/gnome-application-encapsulated_postscript.png | bin | 2349 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-pdf-192.png | bin | 12503 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-pdf.png | bin | 2550 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-pgp-192.png | bin | 16839 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-pgp.png | bin | 2583 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-postscript-192.png | bin | 14137 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-postscript-72.png | bin | 5382 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-postscript-96.png | bin | 7856 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-postscript.png | bin | 2358 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-c-header.png | bin | 2439 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-c-source.png | bin | 2466 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-cc-source.png | bin | 2382 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-e-theme.png | bin | 3643 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-generic-spreadsheet.png | bin | 2905 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-gnome-app-info.png | bin | 2495 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-java-source.png | bin | 2390 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-kde-app-info.png | bin | 2476 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-php.png | bin | 2504 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-reject.png | bin | 2575 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-scheme-source.png | bin | 2307 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-application-x-sql.png | bin | 2444 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-basic.png | bin | 2412 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-midi.png | bin | 2411 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-ulaw.png | bin | 2395 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-aiff.png | bin | 2402 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-mod-192.png | bin | 13275 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-mod.png | bin | 2504 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-mp3-192.png | bin | 13344 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-mp3.png | bin | 2492 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-ogg-192.png | bin | 13328 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-ogg.png | bin | 2421 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-pn-realaudio.png | bin | 2363 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-real-192.png | bin | 12994 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-s3m-192.png | bin | 13475 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-s3m.png | bin | 2500 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-stm-192.png | bin | 13297 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-stm.png | bin | 2451 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-voc.png | bin | 2384 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-wav.png | bin | 2419 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-xi-192.png | bin | 13058 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-xi.png | bin | 2517 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio-x-xm.png | bin | 2497 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-audio.png | bin | 3087 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-compressed-192.png | bin | 31293 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-compressed.png | bin | 4158 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-core.png | bin | 3494 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-emacs-192.png | bin | 57796 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-font-afm.png | bin | 2589 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-font-ttf.png | bin | 2635 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-font-x-pcf.png | bin | 2465 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-gimp.png | bin | 3410 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-gnumeric.png | bin | 4799 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-http-url.png | bin | 2580 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-bmp.png | bin | 2278 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-generic.png | bin | 2301 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-gif.png | bin | 2303 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-ief.png | bin | 2297 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-jpeg.png | bin | 2253 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-pbm.png | bin | 2282 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-pgm.png | bin | 2284 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-png.png | bin | 2277 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-pnm.png | bin | 2276 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-ppm.png | bin | 2286 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-psd.png | bin | 2279 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-ras.png | bin | 2278 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-rgb.png | bin | 2279 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-tga.png | bin | 2281 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-tiff.png | bin | 2269 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-x-xfig.png | bin | 3262 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-xbm.png | bin | 2286 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-xcf.png | bin | 2708 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-xpm.png | bin | 2285 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-image-xwd.png | bin | 2323 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-library.png | bin | 2359 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-manpage.png | bin | 2640 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-objectfile.png | bin | 3333 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-pack-deb.png | bin | 3182 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-pack-rpm.png | bin | 5101 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-package.png | bin | 3560 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-tex-192.png | bin | 14759 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-tex.png | bin | 2480 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-html-192.png | bin | 16866 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-html.png | bin | 2532 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-x-authors.png | bin | 2333 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-x-copying.png | bin | 2398 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-x-credits.png | bin | 2361 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-x-install.png | bin | 2542 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-x-makefile-192.png | bin | 13914 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-x-makefile.png | bin | 2569 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-text-x-readme.png | bin | 2407 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-textfile.png | bin | 2763 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-video-mpeg.png | bin | 2667 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-video-quicktime.png | bin | 2682 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-video-x-msvideo.png | bin | 2693 -> 0 bytes | |||
| -rw-r--r-- | icons/gnome-word-192.png | bin | 22234 -> 0 bytes | |||
| -rw-r--r-- | icons/i-blockdev.png | bin | 3345 -> 0 bytes | |||
| -rw-r--r-- | icons/i-cdrom-192.png | bin | 21239 -> 0 bytes | |||
| -rw-r--r-- | icons/i-cdrom.png | bin | 2922 -> 0 bytes | |||
| -rw-r--r-- | icons/i-chardev.png | bin | 4067 -> 0 bytes | |||
| -rw-r--r-- | icons/i-core.png | bin | 3265 -> 0 bytes | |||
| -rw-r--r-- | icons/i-device.png | bin | 1199 -> 0 bytes | |||
| -rw-r--r-- | icons/i-dirclosed.png | bin | 2662 -> 0 bytes | |||
| -rw-r--r-- | icons/i-executable.png | bin | 4905 -> 0 bytes | |||
| -rw-r--r-- | icons/i-fifo.png | bin | 2698 -> 0 bytes | |||
| -rw-r--r-- | icons/i-floppy.png | bin | 2940 -> 0 bytes | |||
| -rw-r--r-- | icons/i-harddisk.png | bin | 9540 -> 0 bytes | |||
| -rw-r--r-- | icons/i-music-12.png | bin | 638 -> 0 bytes | |||
| -rw-r--r-- | icons/i-music-24.png | bin | 1094 -> 0 bytes | |||
| -rw-r--r-- | icons/i-music-36.png | bin | 1820 -> 0 bytes | |||
| -rw-r--r-- | icons/i-music.png | bin | 2597 -> 0 bytes | |||
| -rw-r--r-- | icons/i-nfs.png | bin | 2513 -> 0 bytes | |||
| -rw-r--r-- | icons/i-printer.png | bin | 2344 -> 0 bytes | |||
| -rw-r--r-- | icons/i-sock.png | bin | 2434 -> 0 bytes | |||
| -rw-r--r-- | icons/i-zip.png | bin | 2838 -> 0 bytes | |||
| -rw-r--r-- | icons/i-zipdisk.png | bin | 2542 -> 0 bytes | |||
| -rw-r--r-- | icons/i-zipdisk2.png | bin | 2469 -> 0 bytes | |||
| -rw-r--r-- | libnautilus-private/nautilus-find-icon-image.c | 31 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.c | 4 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-theme.c | 136 | ||||
| -rw-r--r-- | po/ChangeLog | 6 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
181 files changed, 1158 insertions, 245 deletions
@@ -1,3 +1,257 @@ +2002-01-22 Seth Nickell <snickell@stanford.edu> + + Seperate document icons from the themes so they + can be moved into gnome-mime-data and used by + other applications more cleanly. + + * configure.in: + + * icons/Makefile.am: + * icons/default.xml: + * icons/default/.cvsignore: + * icons/default/Back.png: + * icons/default/Forward.png: + * icons/default/Home.png: + * icons/default/Makefile: + * icons/default/Makefile.am: + * icons/default/Makefile.in: + * icons/default/Refresh.png: + * icons/default/Search.png: + * icons/default/SearchWeb.png: + * icons/default/Stop.png: + * icons/default/Up.png: + * icons/default/decrement.png: + * icons/default/default.xml: + * icons/default/home.png: + * icons/default/i-bookmark-20.png: + * icons/default/i-bookmark-missing-20.png: + * icons/default/i-bookmark-missing.png: + * icons/default/i-bookmark.png: + * icons/default/i-broken-image.png: + * icons/default/i-directory-12.png: + * icons/default/i-directory-24.png: + * icons/default/i-directory-36.png: + * icons/default/i-directory-72.png: + * icons/default/i-directory-96.png: + * icons/default/i-directory-accept-12.png: + * icons/default/i-directory-accept-24.png: + * icons/default/i-directory-accept-36.png: + * icons/default/i-directory-accept-72.png: + * icons/default/i-directory-accept-96.png: + * icons/default/i-directory-accept.png: + * icons/default/i-directory-accept.xml: + * icons/default/i-directory.png: + * icons/default/i-directory.xml: + * icons/default/i-regular-12.png: + * icons/default/i-regular-24.png: + * icons/default/i-regular-36.png: + * icons/default/i-regular-72.png: + * icons/default/i-regular-96.png: + * icons/default/i-regular.png: + * icons/default/i-regular.xml: + * icons/default/i-search-72.png: + * icons/default/i-spreadsheet.png: + * icons/default/i-stalled.png: + * icons/default/i-symlink.png: + * icons/default/i-web-72.png: + * icons/default/increment.png: + * icons/default/loading.png: + * icons/default/manual.png: + * icons/default/number_strip.png: + * icons/default/side_bar_image.png: + * icons/default/temp-home.png: + * icons/default/theme_preview.png: + * icons/default/trash-empty.png: + * icons/default/trash-full.png: + * icons/default/zoom_body.png: + + Move default theme from icons/ into icons/default. + + * icons/gnome-application-encapsulated_postscript.png: + * icons/gnome-application-pdf-192.png: + * icons/gnome-application-pdf.png: + * icons/gnome-application-pgp-192.png: + * icons/gnome-application-pgp.png: + * icons/gnome-application-postscript-192.png: + * icons/gnome-application-postscript-72.png: + * icons/gnome-application-postscript-96.png: + * icons/gnome-application-postscript.png: + * icons/gnome-application-x-c-header.png: + * icons/gnome-application-x-c-source.png: + * icons/gnome-application-x-cc-source.png: + * icons/gnome-application-x-e-theme.png: + * icons/gnome-application-x-generic-spreadsheet.png: + * icons/gnome-application-x-gnome-app-info.png: + * icons/gnome-application-x-java-source.png: + * icons/gnome-application-x-kde-app-info.png: + * icons/gnome-application-x-php.png: + * icons/gnome-application-x-reject.png: + * icons/gnome-application-x-scheme-source.png: + * icons/gnome-application-x-sql.png: + * icons/gnome-audio-basic.png: + * icons/gnome-audio-midi.png: + * icons/gnome-audio-ulaw.png: + * icons/gnome-audio-x-aiff.png: + * icons/gnome-audio-x-mod-192.png: + * icons/gnome-audio-x-mod.png: + * icons/gnome-audio-x-mp3-192.png: + * icons/gnome-audio-x-mp3.png: + * icons/gnome-audio-x-ogg-192.png: + * icons/gnome-audio-x-ogg.png: + * icons/gnome-audio-x-pn-realaudio.png: + * icons/gnome-audio-x-real-192.png: + * icons/gnome-audio-x-s3m-192.png: + * icons/gnome-audio-x-s3m.png: + * icons/gnome-audio-x-stm-192.png: + * icons/gnome-audio-x-stm.png: + * icons/gnome-audio-x-voc.png: + * icons/gnome-audio-x-wav.png: + * icons/gnome-audio-x-xi-192.png: + * icons/gnome-audio-x-xi.png: + * icons/gnome-audio-x-xm.png: + * icons/gnome-audio.png: + * icons/gnome-compressed-192.png: + * icons/gnome-compressed.png: + * icons/gnome-core.png: + * icons/gnome-emacs-192.png: + * icons/gnome-font-afm.png: + * icons/gnome-font-ttf.png: + * icons/gnome-font-x-pcf.png: + * icons/gnome-gimp.png: + * icons/gnome-gnumeric.png: + * icons/gnome-http-url.png: + * icons/gnome-image-bmp.png: + * icons/gnome-image-generic.png: + * icons/gnome-image-gif.png: + * icons/gnome-image-ief.png: + * icons/gnome-image-jpeg.png: + * icons/gnome-image-pbm.png: + * icons/gnome-image-pgm.png: + * icons/gnome-image-png.png: + * icons/gnome-image-pnm.png: + * icons/gnome-image-ppm.png: + * icons/gnome-image-psd.png: + * icons/gnome-image-ras.png: + * icons/gnome-image-rgb.png: + * icons/gnome-image-tga.png: + * icons/gnome-image-tiff.png: + * icons/gnome-image-x-xfig.png: + * icons/gnome-image-xbm.png: + * icons/gnome-image-xcf.png: + * icons/gnome-image-xpm.png: + * icons/gnome-image-xwd.png: + * icons/gnome-library.png: + * icons/gnome-manpage.png: + * icons/gnome-objectfile.png: + * icons/gnome-pack-deb.png: + * icons/gnome-pack-rpm.png: + * icons/gnome-package.png: + * icons/gnome-tex-192.png: + * icons/gnome-tex.png: + * icons/gnome-text-html-192.png: + * icons/gnome-text-html.png: + * icons/gnome-text-x-authors.png: + * icons/gnome-text-x-copying.png: + * icons/gnome-text-x-credits.png: + * icons/gnome-text-x-install.png: + * icons/gnome-text-x-makefile-192.png: + * icons/gnome-text-x-makefile.png: + * icons/gnome-text-x-readme.png: + * icons/gnome-textfile.png: + * icons/gnome-video-mpeg.png: + * icons/gnome-video-quicktime.png: + * icons/gnome-video-x-msvideo.png: + * icons/gnome-word-192.png: + * icons/i-blockdev.png: + * icons/i-bookmark-20.png: + * icons/i-bookmark-missing-20.png: + * icons/i-bookmark-missing.png: + * icons/i-bookmark.png: + * icons/i-broken-image.png: + * icons/i-cdrom-192.png: + * icons/i-cdrom.png: + * icons/i-chardev.png: + * icons/i-core.png: + * icons/i-device.png: + * icons/i-dirclosed.png: + * icons/i-directory-12.png: + * icons/i-directory-24.png: + * icons/i-directory-36.png: + * icons/i-directory-72.png: + * icons/i-directory-96.png: + * icons/i-directory-accept-12.png: + * icons/i-directory-accept-24.png: + * icons/i-directory-accept-36.png: + * icons/i-directory-accept-72.png: + * icons/i-directory-accept-96.png: + * icons/i-directory-accept.png: + * icons/i-directory-accept.xml: + * icons/i-directory.png: + * icons/i-directory.xml: + * icons/i-executable.png: + * icons/i-fifo.png: + * icons/i-floppy.png: + * icons/i-harddisk.png: + * icons/i-music-12.png: + * icons/i-music-24.png: + * icons/i-music-36.png: + * icons/i-music.png: + * icons/i-nfs.png: + * icons/i-printer.png: + * icons/i-regular-12.png: + * icons/i-regular-24.png: + * icons/i-regular-36.png: + * icons/i-regular-72.png: + * icons/i-regular-96.png: + * icons/i-regular.png: + * icons/i-regular.xml: + * icons/i-search-72.png: + * icons/i-sock.png: + * icons/i-spreadsheet.png: + * icons/i-stalled.png: + * icons/i-symlink.png: + * icons/i-web-72.png: + * icons/i-zip.png: + * icons/i-zipdisk.png: + * icons/i-zipdisk2.png: + * icons/loading.png: + * icons/manual.png: + * icons/temp-home.png: + * icons/trash-empty.png: + * icons/trash-full.png: + + Move icons to either gnome-mime-data/icons or, perhaps, + nautilus/icons/default + + * libnautilus-private/nautilus-find-icon-image.c: + (make_full_icon_path), (get_themed_icon_file_path), + (nautilus_get_icon_file_name): + + Add support for looking in DATADIR/share/pixmaps/document-icons + as a fallback for the current theme and the fallback theme. + + Remove hardcoded "default" theme stuff. + + * libnautilus-private/nautilus-icon-factory.c: + (icon_theme_changed_callback): + + If a theme doesn't have a fallback theme listed, use the + "default" theme as the fallback. Should be the only default + theme hardcoding left. + + * libnautilus-private/nautilus-theme.c: (load_theme_document), + (nautilus_theme_get_theme_data_from_theme), + (nautilus_theme_get_image_path_from_theme), + (nautilus_theme_make_preview_pixbuf), (has_image_file), + (theme_get_property), (nautilus_theme_for_each_theme): + + Remove hardcoding of default theme. + + * icons/crux_eggplant/crux_eggplant.xml: + + Remove inheritance clause which was pointing to "arlo", + a theme which does not exist anymore. + 2002-01-16 Havoc Pennington <hp@redhat.com> * libnautilus-private/nautilus-file-operations.c diff --git a/configure.in b/configure.in index 75431c775..5fc2fc6b7 100644 --- a/configure.in +++ b/configure.in @@ -345,6 +345,7 @@ icons/crux_teal/Makefile icons/crux_teal/backgrounds/Makefile icons/crux_teal/sidebar_tab_pieces/Makefile icons/crux_teal/throbber/Makefile +icons/default/Makefile icons/gnome/Makefile icons/gnome/sidebar_tab_pieces/Makefile icons/gnome/throbber/Makefile diff --git a/icons/Makefile.am b/icons/Makefile.am index 8c35b0f8d..916487cce 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -3,6 +3,7 @@ NULL= SUBDIRS =\ crux_eggplant \ crux_teal \ + default \ gnome \ sidebar_tab_pieces \ sierra \ @@ -35,7 +36,6 @@ icon_DATA =\ computer.png \ computer.svg \ decrement.png \ - default.xml \ druid_header.png \ druid_header_stretch.png \ druid_sidebar.png \ @@ -64,141 +64,15 @@ icon_DATA =\ emblems.png \ expert-selected.png \ expert.png \ - gnome-application-encapsulated_postscript.png \ - gnome-application-pdf.png \ - gnome-application-pgp.png \ - gnome-application-postscript.png \ - gnome-application-x-c-header.png \ - gnome-application-x-c-source.png \ - gnome-application-x-cc-source.png \ - gnome-application-x-e-theme.png \ - gnome-application-x-generic-spreadsheet.png \ - gnome-application-x-gnome-app-info.png \ - gnome-application-x-java-source.png \ - gnome-application-x-kde-app-info.png \ - gnome-application-x-php.png \ - gnome-application-x-reject.png \ - gnome-application-x-scheme-source.png \ - gnome-application-x-sql.png \ - gnome-audio-basic.png \ - gnome-audio-midi.png \ - gnome-audio-ulaw.png \ - gnome-audio-x-aiff.png \ - gnome-audio-x-mod.png \ - gnome-audio-x-pn-realaudio.png \ - gnome-audio-x-s3m.png \ - gnome-audio-x-stm.png \ - gnome-audio-x-voc.png \ - gnome-audio-x-wav.png \ - gnome-audio-x-xi.png \ - gnome-audio-x-xm.png \ - gnome-audio.png \ - gnome-compressed.png \ - gnome-font-afm.png \ - gnome-font-ttf.png \ - gnome-font-x-pcf.png \ - gnome-gimp.png \ - gnome-gnumeric.png \ - gnome-http-url.png \ - gnome-image-bmp.png \ - gnome-image-generic.png \ - gnome-image-gif.png \ - gnome-image-ief.png \ - gnome-image-jpeg.png \ - gnome-image-pbm.png \ - gnome-image-pgm.png \ - gnome-image-png.png \ - gnome-image-pnm.png \ - gnome-image-ppm.png \ - gnome-image-psd.png \ - gnome-image-ras.png \ - gnome-image-rgb.png \ - gnome-image-tga.png \ - gnome-image-tiff.png \ - gnome-image-x-xfig.png \ - gnome-image-xbm.png \ - gnome-image-xcf.png \ - gnome-image-xpm.png \ - gnome-image-xwd.png \ - gnome-library.png \ - gnome-manpage.png \ - gnome-objectfile.png \ - gnome-pack-deb.png \ - gnome-pack-rpm.png \ - gnome-package.png \ - gnome-tex.png \ - gnome-text-html.png \ - gnome-text-x-authors.png \ - gnome-text-x-copying.png \ - gnome-text-x-credits.png \ - gnome-text-x-install.png \ - gnome-text-x-makefile.png \ - gnome-text-x-readme.png \ - gnome-textfile.png \ - gnome-video-mpeg.png \ - gnome-video-quicktime.png \ - gnome-video-x-msvideo.png \ hand.png \ hand-72.png \ hand-96.png \ home.png \ - i-blockdev.png \ - i-bookmark-20.png \ - i-bookmark-missing-20.png \ - i-bookmark-missing.png \ - i-bookmark.png \ - i-broken-image.png \ - i-cdrom.png \ - i-chardev.png \ - i-core.png \ - i-device.png \ - i-dirclosed.png \ - i-directory-12.png \ - i-directory-24.png \ - i-directory-36.png \ - i-directory-72.png \ - i-directory-96.png \ - i-directory.png \ - i-directory-accept-12.png \ - i-directory-accept-24.png \ - i-directory-accept-36.png \ - i-directory-accept-72.png \ - i-directory-accept-96.png \ - i-directory-accept.png \ - i-directory.xml \ - i-directory-accept.xml \ - i-executable.png \ - i-fifo.png \ - i-floppy.png \ - i-harddisk.png \ - i-music-12.png \ - i-music-24.png \ - i-music-36.png \ - i-music.png \ - i-nfs.png \ - i-printer.png \ - i-regular-12.png \ - i-regular-24.png \ - i-regular-36.png \ - i-regular-72.png \ - i-regular-96.png \ - i-regular.png \ - i-regular.xml \ - i-search-72.png \ - i-sock.png \ - i-spreadsheet.png \ - i-stalled.png \ - i-symlink.png \ - i-web-72.png \ - i-zipdisk.png \ - i-zipdisk2.png \ increment.png \ intermediate-selected.png \ intermediate.png \ knob.png \ leftarrow.png \ - loading.png \ - manual.png \ multi-ok.png \ nautilus-mini-logo.png \ netscape.png \ @@ -211,14 +85,11 @@ icon_DATA =\ search.png \ services-rpm-72.png \ side_bar_image.png \ - temp-home.png \ text-selection-frame.png \ text-selection-frame-aa.png \ theme_preview.png \ thumbnail_frame.png \ tiny-alert.png \ - trash-empty.png \ - trash-full.png \ uparrow.png \ zoom_body.png \ $(NULL) diff --git a/icons/crux_eggplant/crux_eggplant.xml b/icons/crux_eggplant/crux_eggplant.xml index f192815e1..8a6cfc9ca 100644 --- a/icons/crux_eggplant/crux_eggplant.xml +++ b/icons/crux_eggplant/crux_eggplant.xml @@ -17,5 +17,4 @@ <desktop background_tile_image="./backgrounds/background_pattern.png"/> <zoom_control number_v_offset="-6" number_h_offset="0" digit_width="6"/> <throbber frame_count="30" url="http://www.eazel.com"/> - <icon-images default_theme="arlo"/> </theme> diff --git a/icons/default/.cvsignore b/icons/default/.cvsignore new file mode 100644 index 000000000..3dda72986 --- /dev/null +++ b/icons/default/.cvsignore @@ -0,0 +1,2 @@ +Makefile.in +Makefile diff --git a/icons/default/Back.png b/icons/default/Back.png Binary files differnew file mode 100644 index 000000000..f1c9d94a7 --- /dev/null +++ b/icons/default/Back.png diff --git a/icons/default/Forward.png b/icons/default/Forward.png Binary files differnew file mode 100644 index 000000000..64011ab54 --- /dev/null +++ b/icons/default/Forward.png diff --git a/icons/default/Home.png b/icons/default/Home.png Binary files differnew file mode 100644 index 000000000..e416606c2 --- /dev/null +++ b/icons/default/Home.png diff --git a/icons/default/Makefile b/icons/default/Makefile new file mode 100644 index 000000000..b6b1f968a --- /dev/null +++ b/icons/default/Makefile @@ -0,0 +1,385 @@ +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = . +top_srcdir = ../.. + +prefix = /gnome/GNOME2 +exec_prefix = ${prefix} + +bindir = ${exec_prefix}/bin +sbindir = ${exec_prefix}/sbin +libexecdir = ${exec_prefix}/libexec +datadir = ${prefix}/share +sysconfdir = ${prefix}/etc +sharedstatedir = ${prefix}/com +localstatedir = ${prefix}/var +libdir = ${exec_prefix}/lib +infodir = ${prefix}/info +mandir = ${prefix}/man +includedir = ${prefix}/include +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/nautilus +pkglibdir = $(libdir)/nautilus +pkgincludedir = $(includedir)/nautilus + +top_builddir = ../.. + +ACLOCAL = aclocal -I /gnome/GNOME2/share/aclocal/gnome2-macros +AUTOCONF = autoconf +AUTOMAKE = automake +AUTOHEADER = autoheader + +INSTALL = /usr/bin/install -c +INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_SCRIPT = ${INSTALL} +transform = s,x,x, + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = i686-pc-linux-gnu +host_triplet = i686-pc-linux-gnu +AS = @AS@ +CATALOGS = az.gmo ca.gmo cs.gmo da.gmo de.gmo el.gmo en_GB.gmo es.gmo fi.gmo fr.gmo ga.gmo gl.gmo hu.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo nl.gmo nn.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sv.gmo ta.gmo tr.gmo uk.gmo zh_TW.gmo +CATOBJEXT = .gmo +CC = gcc +COMPONENT_CFLAGS = -I/gnome/GNOME2/include/eel-2 -I/gnome/GNOME2/include/gconf/2 -I/gnome/GNOME2/include/bonobo-activation-2.0 -I/gnome/GNOME2/include/glib-2.0 -I/gnome/GNOME2/lib/glib-2.0/include -I/gnome/GNOME2/include/orbit-2.0 -I/gnome/GNOME2/include/linc-1.0 -I/gnome/GNOME2/include/libxml2 -I/gnome/GNOME2/include/gtk-2.0 -I/gnome/GNOME2/include/gnome-vfs-2.0 -I/gnome/GNOME2/lib/gnome-vfs-2.0/include -I/gnome/GNOME2/lib/gtk-2.0/include -I/gnome/GNOME2/include/pango-1.0 -I/usr/X11R6/include -I/gnome/GNOME2/include/freetype2 -I/gnome/GNOME2/include/atk-1.0 -I/gnome/GNOME2/include/libart-2.0 -I/gnome/GNOME2/include/libgnome-2.0 -I/gnome/GNOME2/include/libbonobo-2.0 -I/gnome/GNOME2/include/libgnomecanvas-2.0 -I/gnome/GNOME2/include/libgnomeui-2.0 -I/gnome/GNOME2/include/libbonoboui-2.0 -I/gnome/GNOME2/include/gnome-vfs-module-2.0 +COMPONENT_LIBS = -L/gnome/GNOME2/lib -L/usr/X11R6/lib -leel-2 -lgnomeui-2 -lSM -lICE -lgnome-2 -lgconf-2 -lbonoboui-2 -lbonobo-2 -lgnomecanvas-2 -lart_lgpl_2 -lpangoft2 -lgtk-x11-1.3 -lgdk-x11-1.3 -lgdk_pixbuf-1.3 -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgnomevfs-2 -lbonobo-activation -lORBit-2 -llinc -lgobject-1.3 -lxml2 -lz -lm -lgthread-1.3 -lpthread -lgmodule-1.3 -ldl -lglib-1.3 +CORE_CFLAGS = -I/gnome/GNOME2/include/eel-2 -I/gnome/GNOME2/include/gconf/2 -I/gnome/GNOME2/include/bonobo-activation-2.0 -I/gnome/GNOME2/include/glib-2.0 -I/gnome/GNOME2/lib/glib-2.0/include -I/gnome/GNOME2/include/orbit-2.0 -I/gnome/GNOME2/include/linc-1.0 -I/gnome/GNOME2/include/libxml2 -I/gnome/GNOME2/include/gtk-2.0 -I/gnome/GNOME2/include/gnome-vfs-2.0 -I/gnome/GNOME2/lib/gnome-vfs-2.0/include -I/gnome/GNOME2/lib/gtk-2.0/include -I/gnome/GNOME2/include/pango-1.0 -I/usr/X11R6/include -I/gnome/GNOME2/include/freetype2 -I/gnome/GNOME2/include/atk-1.0 -I/gnome/GNOME2/include/libart-2.0 -I/gnome/GNOME2/include/libgnome-2.0 -I/gnome/GNOME2/include/libbonobo-2.0 -I/gnome/GNOME2/include/libgnomecanvas-2.0 -I/gnome/GNOME2/include/libgnomeui-2.0 -I/gnome/GNOME2/include/libbonoboui-2.0 -I/gnome/GNOME2/include/librsvg-2 -I/gnome/GNOME2/include +CORE_IDL_INCLUDES = -I /gnome/GNOME2/share/idl/bonobo-activation-2.0 -I /gnome/GNOME2/share/idl/bonobo-2.0 +CORE_LIBS = -L/gnome/GNOME2/lib -L/usr/X11R6/lib -leel-2 -lgnomeui-2 -lSM -lICE -lgnome-2 -lgnomevfs-2 -lgconf-2 -lrsvg-2 -lbonoboui-2 -lbonobo-2 -lbonobo-activation -lORBit-2 -llinc -lgthread-1.3 -lpthread -lxml2 -lz -lgnomecanvas-2 -lart_lgpl_2 -lpangoft2 -lgtk-x11-1.3 -lgdk-x11-1.3 -lgdk_pixbuf-1.3 -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgobject-1.3 -lgmodule-1.3 -ldl -lglib-1.3 -lesd -laudiofile -lm -lcdda_paranoia -lcdda_interface -lfam -ljpeg +CPP = gcc -E +DATADIRNAME = share +DLLTOOL = @DLLTOOL@ +ECHO = echo +EEL_REQUIRED = 1.1.2 +ENABLE_PROFILER = +EXEEXT = +FAM_LIBS = -lfam +GETTEXT_PACKAGE = nautilus +GIMPHWRAPBOX_CFLAGS = -I/gnome/GNOME2/include/gtk-2.0 -I/gnome/GNOME2/lib/gtk-2.0/include -I/gnome/GNOME2/include/glib-2.0 -I/gnome/GNOME2/lib/glib-2.0/include -I/gnome/GNOME2/include/pango-1.0 -I/usr/X11R6/include -I/gnome/GNOME2/include/freetype2 -I/gnome/GNOME2/include/atk-1.0 +GLIB_GENMARSHAL = /gnome/GNOME2/bin/glib-genmarshal +GMOFILES = az.gmo ca.gmo cs.gmo da.gmo de.gmo el.gmo en_GB.gmo es.gmo fi.gmo fr.gmo ga.gmo gl.gmo hu.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo nl.gmo nn.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sv.gmo ta.gmo tr.gmo uk.gmo zh_TW.gmo +GMSGFMT = /gnome/GNOME2/bin/msgfmt +GNOME_ACLOCAL_DIR = /gnome/GNOME2/share/aclocal/gnome2-macros +GNOME_ACLOCAL_FLAGS = -I /gnome/GNOME2/share/aclocal/gnome2-macros +GNOME_INTERFACE_VERSION = 2 +GNOME_VFS_REQUIRED = 1.1 +GTKDOC = @GTKDOC@ +HAVE_GTK_DOC = @HAVE_GTK_DOC@ +HAVE_JW = yes +HAVE_MEDUSA = +INSTOBJEXT = .mo +INTLDEPS = +INTLLIBS = +INTLOBJS = +INTLTOOL_CAVES_RULE = %.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u +INTLTOOL_DESKTOP_RULE = %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u +INTLTOOL_DIRECTORY_RULE = %.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u +INTLTOOL_EXTRACT = $(top_builddir)/intltool-extract +INTLTOOL_KEYS_RULE = %.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -k -u +INTLTOOL_MERGE = $(top_builddir)/intltool-merge +INTLTOOL_OAF_RULE = %.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -p +INTLTOOL_PERL = /usr/bin/perl +INTLTOOL_PONG_RULE = %.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u +INTLTOOL_SERVER_RULE = %.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u +INTLTOOL_SHEET_RULE = %.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u +INTLTOOL_SOUNDLIST_RULE = %.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u +INTLTOOL_UPDATE = $(top_builddir)/intltool-update +INTLTOOL_XML_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u +JW = /usr/bin/jw +LIBJPEG = -ljpeg +LIBNAUTILUS_CFLAGS = -I/gnome/GNOME2/include/eel-2 -I/gnome/GNOME2/include/gconf/2 -I/gnome/GNOME2/include/bonobo-activation-2.0 -I/gnome/GNOME2/include/glib-2.0 -I/gnome/GNOME2/lib/glib-2.0/include -I/gnome/GNOME2/include/orbit-2.0 -I/gnome/GNOME2/include/linc-1.0 -I/gnome/GNOME2/include/libxml2 -I/gnome/GNOME2/include/gtk-2.0 -I/gnome/GNOME2/include/gnome-vfs-2.0 -I/gnome/GNOME2/lib/gnome-vfs-2.0/include -I/gnome/GNOME2/lib/gtk-2.0/include -I/gnome/GNOME2/include/pango-1.0 -I/usr/X11R6/include -I/gnome/GNOME2/include/freetype2 -I/gnome/GNOME2/include/atk-1.0 -I/gnome/GNOME2/include/libart-2.0 -I/gnome/GNOME2/include/libgnome-2.0 -I/gnome/GNOME2/include/libbonobo-2.0 -I/gnome/GNOME2/include/libgnomecanvas-2.0 -I/gnome/GNOME2/include/libgnomeui-2.0 -I/gnome/GNOME2/include/libbonoboui-2.0 +LIBNAUTILUS_IDL_INCLUDES = -I /gnome/GNOME2/share/idl/bonobo-activation-2.0 -I /gnome/GNOME2/share/idl/bonobo-2.0 +LIBNAUTILUS_LIBS = -L/gnome/GNOME2/lib -L/usr/X11R6/lib -leel-2 -lgnomeui-2 -lSM -lICE -lgnome-2 -lgnomevfs-2 -lgconf-2 -lbonoboui-2 -lbonobo-2 -lbonobo-activation -lORBit-2 -llinc -lgthread-1.3 -lpthread -lxml2 -lz -lgnomecanvas-2 -lart_lgpl_2 -lpangoft2 -lgtk-x11-1.3 -lgdk-x11-1.3 -lgdk_pixbuf-1.3 -lm -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgobject-1.3 -lgmodule-1.3 -ldl -lglib-1.3 +LIBPNG = -lpng -lz +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +MAINT = +MAKEINFO = makeinfo +MEDUSA_REQUIRED = 0.5.1 +MKINSTALLDIRS = ./mkinstalldirs +MUSIC_COMPONENT_CFLAGS = -I/gnome/GNOME2/include/eel-2 -I/gnome/GNOME2/include/gconf/2 -I/gnome/GNOME2/include/bonobo-activation-2.0 -I/gnome/GNOME2/include/glib-2.0 -I/gnome/GNOME2/lib/glib-2.0/include -I/gnome/GNOME2/include/orbit-2.0 -I/gnome/GNOME2/include/linc-1.0 -I/gnome/GNOME2/include/libxml2 -I/gnome/GNOME2/include/gtk-2.0 -I/gnome/GNOME2/include/gnome-vfs-2.0 -I/gnome/GNOME2/lib/gnome-vfs-2.0/include -I/gnome/GNOME2/lib/gtk-2.0/include -I/gnome/GNOME2/include/pango-1.0 -I/usr/X11R6/include -I/gnome/GNOME2/include/freetype2 -I/gnome/GNOME2/include/atk-1.0 -I/gnome/GNOME2/include/libart-2.0 -I/gnome/GNOME2/include/libgnome-2.0 -I/gnome/GNOME2/include/libbonobo-2.0 -I/gnome/GNOME2/include/libgnomecanvas-2.0 -I/gnome/GNOME2/include/libgnomeui-2.0 -I/gnome/GNOME2/include/libbonoboui-2.0 -I/gnome/GNOME2/include/gnome-vfs-module-2.0 -I/gnome/GNOME2/include +MUSIC_COMPONENT_LIBS = -L/gnome/GNOME2/lib -L/usr/X11R6/lib -leel-2 -lgnomeui-2 -lSM -lICE -lgnome-2 -lgconf-2 -lbonoboui-2 -lbonobo-2 -lgnomecanvas-2 -lart_lgpl_2 -lpangoft2 -lgtk-x11-1.3 -lgdk-x11-1.3 -lgdk_pixbuf-1.3 -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgnomevfs-2 -lbonobo-activation -lORBit-2 -llinc -lgobject-1.3 -lxml2 -lz -lgthread-1.3 -lpthread -lgmodule-1.3 -ldl -lglib-1.3 -lesd -laudiofile -lm +OBJDUMP = @OBJDUMP@ +OBJEXT = o +ORBIT_CFLAGS = -DORBIT2=1 -I/gnome/GNOME2/include/orbit-2.0 -I/gnome/GNOME2/include/linc-1.0 -I/gnome/GNOME2/include/glib-2.0 -I/gnome/GNOME2/lib/glib-2.0/include +ORBIT_CONFIG = /gnome/GNOME2/bin/orbit2-config +ORBIT_IDL = /gnome/GNOME2/bin/orbit-idl-2 +ORBIT_LIBS = -Wl,--export-dynamic -L/gnome/GNOME2/lib -lORBit-2 -llinc -lgobject-1.3 -lgthread-1.3 -lpthread -lgmodule-1.3 -ldl -lglib-1.3 -lm +PACKAGE = nautilus +PKG_CONFIG = /gnome/GNOME2/bin/pkg-config +POFILES = az.po ca.po cs.po da.po de.po el.po en_GB.po es.po fi.po fr.po ga.po gl.po hu.po it.po ja.po ko.po lt.po lv.po nl.po nn.po no.po pl.po pt.po pt_BR.po ro.po ru.po sk.po sl.po sv.po ta.po tr.po uk.po zh_TW.po +POSUB = po +RANLIB = ranlib +RSVG_REQUIRED = 1.1 +STRIP = strip +USE_NLS = yes +VERSION = 1.1.2 +XML_REQUIRED = 2.4.6 + +NULL = + +SUBDIRS = $(NULL) + + +icondir = $(datadir)/pixmaps/nautilus/default + +icon_DATA = Back.png Forward.png Home.png Refresh.png Search.png Stop.png Up.png SearchWeb.png decrement.png default.xml home.png i-directory-12.png i-directory-24.png i-directory-36.png i-directory-72.png i-directory-96.png i-directory.png i-directory-accept-12.png i-directory-accept-24.png i-directory-accept-36.png i-directory-accept-72.png i-directory-accept-96.png i-directory-accept.png i-directory.xml i-directory-accept.xml i-regular-12.png i-regular-24.png i-regular-36.png i-regular-72.png i-regular-96.png i-regular.png i-regular.xml i-bookmark-20.png i-bookmark-missing-20.png i-bookmark-missing.png i-bookmark.png i-broken-image.png i-search-72.png i-spreadsheet.png i-stalled.png i-symlink.png i-web-72.png increment.png loading.png manual.png number_strip.png side_bar_image.png temp-home.png theme_preview.png trash-empty.png trash-full.png zoom_body.png $(NULL) + + +EXTRA_DIST = $(icon_DATA) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../config.h +CONFIG_CLEAN_FILES = +DATA = $(icon_DATA) + +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/default/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +install-iconDATA: $(icon_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(icondir) + @list='$(icon_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(icondir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(icondir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(icondir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(icondir)/$$p; \ + fi; fi; \ + done + +uninstall-iconDATA: + @$(NORMAL_UNINSTALL) + list='$(icon_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(icondir)/$$p; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + + + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ + done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = icons/default + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu icons/default/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + for subdir in $(SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ + done +info-am: +info: info-recursive +dvi-am: +dvi: dvi-recursive +check-am: all-am +check: check-recursive +installcheck-am: +installcheck: installcheck-recursive +install-exec-am: +install-exec: install-exec-recursive + +install-data-am: install-iconDATA +install-data: install-data-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive +uninstall-am: uninstall-iconDATA +uninstall: uninstall-recursive +all-am: Makefile $(DATA) +all-redirect: all-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: installdirs-recursive +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(icondir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-tags mostlyclean-generic + +mostlyclean: mostlyclean-recursive + +clean-am: clean-tags clean-generic mostlyclean-am + +clean: clean-recursive + +distclean-am: distclean-tags distclean-generic clean-am + -rm -f libtool + +distclean: distclean-recursive + +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-recursive + +.PHONY: uninstall-iconDATA install-iconDATA install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/icons/default/Makefile.am b/icons/default/Makefile.am new file mode 100644 index 000000000..fd55e90f6 --- /dev/null +++ b/icons/default/Makefile.am @@ -0,0 +1,63 @@ +NULL= + +SUBDIRS =\ + $(NULL) + +icondir = $(datadir)/pixmaps/nautilus/default + +icon_DATA =\ + Back.png \ + Forward.png \ + Home.png \ + Refresh.png \ + Search.png \ + Stop.png \ + Up.png \ + SearchWeb.png \ + decrement.png \ + default.xml \ + home.png \ + i-directory-12.png \ + i-directory-24.png \ + i-directory-36.png \ + i-directory-72.png \ + i-directory-96.png \ + i-directory.png \ + i-directory-accept-12.png \ + i-directory-accept-24.png \ + i-directory-accept-36.png \ + i-directory-accept-72.png \ + i-directory-accept-96.png \ + i-directory-accept.png \ + i-directory.xml \ + i-directory-accept.xml \ + i-regular-12.png \ + i-regular-24.png \ + i-regular-36.png \ + i-regular-72.png \ + i-regular-96.png \ + i-regular.png \ + i-regular.xml \ + i-bookmark-20.png \ + i-bookmark-missing-20.png \ + i-bookmark-missing.png \ + i-bookmark.png \ + i-broken-image.png \ + i-search-72.png \ + i-spreadsheet.png \ + i-stalled.png \ + i-symlink.png \ + i-web-72.png \ + increment.png \ + loading.png \ + manual.png \ + number_strip.png \ + side_bar_image.png \ + temp-home.png \ + theme_preview.png \ + trash-empty.png \ + trash-full.png \ + zoom_body.png \ + $(NULL) + +EXTRA_DIST = $(icon_DATA) diff --git a/icons/default/Makefile.in b/icons/default/Makefile.in new file mode 100644 index 000000000..4d6b1e286 --- /dev/null +++ b/icons/default/Makefile.in @@ -0,0 +1,385 @@ +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = ../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AS = @AS@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +COMPONENT_CFLAGS = @COMPONENT_CFLAGS@ +COMPONENT_LIBS = @COMPONENT_LIBS@ +CORE_CFLAGS = @CORE_CFLAGS@ +CORE_IDL_INCLUDES = @CORE_IDL_INCLUDES@ +CORE_LIBS = @CORE_LIBS@ +CPP = @CPP@ +DATADIRNAME = @DATADIRNAME@ +DLLTOOL = @DLLTOOL@ +ECHO = @ECHO@ +EEL_REQUIRED = @EEL_REQUIRED@ +ENABLE_PROFILER = @ENABLE_PROFILER@ +EXEEXT = @EXEEXT@ +FAM_LIBS = @FAM_LIBS@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIMPHWRAPBOX_CFLAGS = @GIMPHWRAPBOX_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ +GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ +GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ +GNOME_VFS_REQUIRED = @GNOME_VFS_REQUIRED@ +GTKDOC = @GTKDOC@ +HAVE_GTK_DOC = @HAVE_GTK_DOC@ +HAVE_JW = @HAVE_JW@ +HAVE_MEDUSA = @HAVE_MEDUSA@ +INSTOBJEXT = @INSTOBJEXT@ +INTLDEPS = @INTLDEPS@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +JW = @JW@ +LIBJPEG = @LIBJPEG@ +LIBNAUTILUS_CFLAGS = @LIBNAUTILUS_CFLAGS@ +LIBNAUTILUS_IDL_INCLUDES = @LIBNAUTILUS_IDL_INCLUDES@ +LIBNAUTILUS_LIBS = @LIBNAUTILUS_LIBS@ +LIBPNG = @LIBPNG@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MEDUSA_REQUIRED = @MEDUSA_REQUIRED@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MUSIC_COMPONENT_CFLAGS = @MUSIC_COMPONENT_CFLAGS@ +MUSIC_COMPONENT_LIBS = @MUSIC_COMPONENT_LIBS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_CONFIG = @ORBIT_CONFIG@ +ORBIT_IDL = @ORBIT_IDL@ +ORBIT_LIBS = @ORBIT_LIBS@ +PACKAGE = @PACKAGE@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +RSVG_REQUIRED = @RSVG_REQUIRED@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XML_REQUIRED = @XML_REQUIRED@ + +NULL = + +SUBDIRS = $(NULL) + + +icondir = $(datadir)/pixmaps/nautilus/default + +icon_DATA = Back.png Forward.png Home.png Refresh.png Search.png Stop.png Up.png SearchWeb.png decrement.png default.xml home.png i-directory-12.png i-directory-24.png i-directory-36.png i-directory-72.png i-directory-96.png i-directory.png i-directory-accept-12.png i-directory-accept-24.png i-directory-accept-36.png i-directory-accept-72.png i-directory-accept-96.png i-directory-accept.png i-directory.xml i-directory-accept.xml i-regular-12.png i-regular-24.png i-regular-36.png i-regular-72.png i-regular-96.png i-regular.png i-regular.xml i-bookmark-20.png i-bookmark-missing-20.png i-bookmark-missing.png i-bookmark.png i-broken-image.png i-search-72.png i-spreadsheet.png i-stalled.png i-symlink.png i-web-72.png increment.png loading.png manual.png number_strip.png side_bar_image.png temp-home.png theme_preview.png trash-empty.png trash-full.png zoom_body.png $(NULL) + + +EXTRA_DIST = $(icon_DATA) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../config.h +CONFIG_CLEAN_FILES = +DATA = $(icon_DATA) + +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/default/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +install-iconDATA: $(icon_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(icondir) + @list='$(icon_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(icondir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(icondir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(icondir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(icondir)/$$p; \ + fi; fi; \ + done + +uninstall-iconDATA: + @$(NORMAL_UNINSTALL) + list='$(icon_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(icondir)/$$p; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ + done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = icons/default + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu icons/default/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + for subdir in $(SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ + done +info-am: +info: info-recursive +dvi-am: +dvi: dvi-recursive +check-am: all-am +check: check-recursive +installcheck-am: +installcheck: installcheck-recursive +install-exec-am: +install-exec: install-exec-recursive + +install-data-am: install-iconDATA +install-data: install-data-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive +uninstall-am: uninstall-iconDATA +uninstall: uninstall-recursive +all-am: Makefile $(DATA) +all-redirect: all-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: installdirs-recursive +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(icondir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-tags mostlyclean-generic + +mostlyclean: mostlyclean-recursive + +clean-am: clean-tags clean-generic mostlyclean-am + +clean: clean-recursive + +distclean-am: distclean-tags distclean-generic clean-am + -rm -f libtool + +distclean: distclean-recursive + +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-recursive + +.PHONY: uninstall-iconDATA install-iconDATA install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/icons/default/Refresh.png b/icons/default/Refresh.png Binary files differnew file mode 100644 index 000000000..8c3812185 --- /dev/null +++ b/icons/default/Refresh.png diff --git a/icons/default/Search.png b/icons/default/Search.png Binary files differnew file mode 100644 index 000000000..b324cbc2b --- /dev/null +++ b/icons/default/Search.png diff --git a/icons/default/SearchWeb.png b/icons/default/SearchWeb.png Binary files differnew file mode 100644 index 000000000..387818b8a --- /dev/null +++ b/icons/default/SearchWeb.png diff --git a/icons/default/Stop.png b/icons/default/Stop.png Binary files differnew file mode 100644 index 000000000..6ddda21b2 --- /dev/null +++ b/icons/default/Stop.png diff --git a/icons/default/Up.png b/icons/default/Up.png Binary files differnew file mode 100644 index 000000000..79c57c2ef --- /dev/null +++ b/icons/default/Up.png diff --git a/icons/default/decrement.png b/icons/default/decrement.png Binary files differnew file mode 100644 index 000000000..3a15d9c10 --- /dev/null +++ b/icons/default/decrement.png diff --git a/icons/default.xml b/icons/default/default.xml index 66ff6f42c..f83c7c7f9 100644 --- a/icons/default.xml +++ b/icons/default/default.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<theme _name="Default" _description="This is the default theme for Nautilus."> +<theme _name="Eazel" _description="This is the default theme for Nautilus."> <sidebar sidebar_background_tile_image="./side_bar_image.png" sidebar_background_color="#474A7C-#22233A:h" diff --git a/icons/default/home.png b/icons/default/home.png Binary files differnew file mode 100644 index 000000000..d7d2bb03f --- /dev/null +++ b/icons/default/home.png diff --git a/icons/i-bookmark-20.png b/icons/default/i-bookmark-20.png Binary files differindex fd68bd070..fd68bd070 100644 --- a/icons/i-bookmark-20.png +++ b/icons/default/i-bookmark-20.png diff --git a/icons/i-bookmark-missing-20.png b/icons/default/i-bookmark-missing-20.png Binary files differindex fc18d35cc..fc18d35cc 100644 --- a/icons/i-bookmark-missing-20.png +++ b/icons/default/i-bookmark-missing-20.png diff --git a/icons/i-bookmark-missing.png b/icons/default/i-bookmark-missing.png Binary files differindex fc18d35cc..fc18d35cc 100644 --- a/icons/i-bookmark-missing.png +++ b/icons/default/i-bookmark-missing.png diff --git a/icons/i-bookmark.png b/icons/default/i-bookmark.png Binary files differindex fd68bd070..fd68bd070 100644 --- a/icons/i-bookmark.png +++ b/icons/default/i-bookmark.png diff --git a/icons/i-broken-image.png b/icons/default/i-broken-image.png Binary files differindex aaf84f76a..aaf84f76a 100644 --- a/icons/i-broken-image.png +++ b/icons/default/i-broken-image.png diff --git a/icons/i-directory-12.png b/icons/default/i-directory-12.png Binary files differindex ed67cd6f7..ed67cd6f7 100644 --- a/icons/i-directory-12.png +++ b/icons/default/i-directory-12.png diff --git a/icons/i-directory-24.png b/icons/default/i-directory-24.png Binary files differindex f0892a743..f0892a743 100644 --- a/icons/i-directory-24.png +++ b/icons/default/i-directory-24.png diff --git a/icons/i-directory-36.png b/icons/default/i-directory-36.png Binary files differindex b42f39af7..b42f39af7 100644 --- a/icons/i-directory-36.png +++ b/icons/default/i-directory-36.png diff --git a/icons/i-directory-72.png b/icons/default/i-directory-72.png Binary files differindex 0d9f50445..0d9f50445 100644 --- a/icons/i-directory-72.png +++ b/icons/default/i-directory-72.png diff --git a/icons/i-directory-96.png b/icons/default/i-directory-96.png Binary files differindex d89079200..d89079200 100644 --- a/icons/i-directory-96.png +++ b/icons/default/i-directory-96.png diff --git a/icons/i-directory-accept-12.png b/icons/default/i-directory-accept-12.png Binary files differindex 189cdb30c..189cdb30c 100644 --- a/icons/i-directory-accept-12.png +++ b/icons/default/i-directory-accept-12.png diff --git a/icons/i-directory-accept-24.png b/icons/default/i-directory-accept-24.png Binary files differindex b55b60782..b55b60782 100644 --- a/icons/i-directory-accept-24.png +++ b/icons/default/i-directory-accept-24.png diff --git a/icons/i-directory-accept-36.png b/icons/default/i-directory-accept-36.png Binary files differindex bac639213..bac639213 100644 --- a/icons/i-directory-accept-36.png +++ b/icons/default/i-directory-accept-36.png diff --git a/icons/i-directory-accept-72.png b/icons/default/i-directory-accept-72.png Binary files differindex e3d3226d8..e3d3226d8 100644 --- a/icons/i-directory-accept-72.png +++ b/icons/default/i-directory-accept-72.png diff --git a/icons/i-directory-accept-96.png b/icons/default/i-directory-accept-96.png Binary files differindex 375ae0688..375ae0688 100644 --- a/icons/i-directory-accept-96.png +++ b/icons/default/i-directory-accept-96.png diff --git a/icons/i-directory-accept.png b/icons/default/i-directory-accept.png Binary files differindex 8d11c0c23..8d11c0c23 100644 --- a/icons/i-directory-accept.png +++ b/icons/default/i-directory-accept.png diff --git a/icons/i-directory-accept.xml b/icons/default/i-directory-accept.xml index 01a37c9c9..01a37c9c9 100644 --- a/icons/i-directory-accept.xml +++ b/icons/default/i-directory-accept.xml diff --git a/icons/i-directory.png b/icons/default/i-directory.png Binary files differindex ef8d05234..ef8d05234 100644 --- a/icons/i-directory.png +++ b/icons/default/i-directory.png diff --git a/icons/i-directory.xml b/icons/default/i-directory.xml index 646c6a5db..646c6a5db 100644 --- a/icons/i-directory.xml +++ b/icons/default/i-directory.xml diff --git a/icons/i-regular-12.png b/icons/default/i-regular-12.png Binary files differindex 0147b0c49..0147b0c49 100644 --- a/icons/i-regular-12.png +++ b/icons/default/i-regular-12.png diff --git a/icons/i-regular-24.png b/icons/default/i-regular-24.png Binary files differindex cd2d3ab7d..cd2d3ab7d 100644 --- a/icons/i-regular-24.png +++ b/icons/default/i-regular-24.png diff --git a/icons/i-regular-36.png b/icons/default/i-regular-36.png Binary files differindex 467cca90a..467cca90a 100644 --- a/icons/i-regular-36.png +++ b/icons/default/i-regular-36.png diff --git a/icons/i-regular-72.png b/icons/default/i-regular-72.png Binary files differindex ae4d26037..ae4d26037 100644 --- a/icons/i-regular-72.png +++ b/icons/default/i-regular-72.png diff --git a/icons/i-regular-96.png b/icons/default/i-regular-96.png Binary files differindex 2367f5c4d..2367f5c4d 100644 --- a/icons/i-regular-96.png +++ b/icons/default/i-regular-96.png diff --git a/icons/i-regular.png b/icons/default/i-regular.png Binary files differindex 557d746e6..557d746e6 100644 --- a/icons/i-regular.png +++ b/icons/default/i-regular.png diff --git a/icons/i-regular.xml b/icons/default/i-regular.xml index 99c92409c..99c92409c 100644 --- a/icons/i-regular.xml +++ b/icons/default/i-regular.xml diff --git a/icons/i-search-72.png b/icons/default/i-search-72.png Binary files differindex e343f7df0..e343f7df0 100644 --- a/icons/i-search-72.png +++ b/icons/default/i-search-72.png diff --git a/icons/i-spreadsheet.png b/icons/default/i-spreadsheet.png Binary files differindex bb4ea39b3..bb4ea39b3 100644 --- a/icons/i-spreadsheet.png +++ b/icons/default/i-spreadsheet.png diff --git a/icons/i-stalled.png b/icons/default/i-stalled.png Binary files differindex 2993aebb8..2993aebb8 100644 --- a/icons/i-stalled.png +++ b/icons/default/i-stalled.png diff --git a/icons/i-symlink.png b/icons/default/i-symlink.png Binary files differindex 0cc746ce1..0cc746ce1 100644 --- a/icons/i-symlink.png +++ b/icons/default/i-symlink.png diff --git a/icons/i-web-72.png b/icons/default/i-web-72.png Binary files differindex 9cfde13eb..9cfde13eb 100644 --- a/icons/i-web-72.png +++ b/icons/default/i-web-72.png diff --git a/icons/default/increment.png b/icons/default/increment.png Binary files differnew file mode 100644 index 000000000..36c7c6caf --- /dev/null +++ b/icons/default/increment.png diff --git a/icons/loading.png b/icons/default/loading.png Binary files differindex 505c805e4..505c805e4 100644 --- a/icons/loading.png +++ b/icons/default/loading.png diff --git a/icons/manual.png b/icons/default/manual.png Binary files differindex 9cd13e60c..9cd13e60c 100644 --- a/icons/manual.png +++ b/icons/default/manual.png diff --git a/icons/default/number_strip.png b/icons/default/number_strip.png Binary files differnew file mode 100644 index 000000000..abefe535f --- /dev/null +++ b/icons/default/number_strip.png diff --git a/icons/default/side_bar_image.png b/icons/default/side_bar_image.png Binary files differnew file mode 100644 index 000000000..ee65b95af --- /dev/null +++ b/icons/default/side_bar_image.png diff --git a/icons/temp-home.png b/icons/default/temp-home.png Binary files differindex d42f12125..d42f12125 100644 --- a/icons/temp-home.png +++ b/icons/default/temp-home.png diff --git a/icons/default/theme_preview.png b/icons/default/theme_preview.png Binary files differnew file mode 100644 index 000000000..22dcaf7fc --- /dev/null +++ b/icons/default/theme_preview.png diff --git a/icons/trash-empty.png b/icons/default/trash-empty.png Binary files differindex 1558f10f6..1558f10f6 100644 --- a/icons/trash-empty.png +++ b/icons/default/trash-empty.png diff --git a/icons/trash-full.png b/icons/default/trash-full.png Binary files differindex 077884663..077884663 100644 --- a/icons/trash-full.png +++ b/icons/default/trash-full.png diff --git a/icons/default/zoom_body.png b/icons/default/zoom_body.png Binary files differnew file mode 100644 index 000000000..44bb58fc4 --- /dev/null +++ b/icons/default/zoom_body.png diff --git a/icons/gnome-application-encapsulated_postscript.png b/icons/gnome-application-encapsulated_postscript.png Binary files differdeleted file mode 100644 index 8f19fdfcc..000000000 --- a/icons/gnome-application-encapsulated_postscript.png +++ /dev/null diff --git a/icons/gnome-application-pdf-192.png b/icons/gnome-application-pdf-192.png Binary files differdeleted file mode 100644 index 6d9de4516..000000000 --- a/icons/gnome-application-pdf-192.png +++ /dev/null diff --git a/icons/gnome-application-pdf.png b/icons/gnome-application-pdf.png Binary files differdeleted file mode 100644 index 437783c3b..000000000 --- a/icons/gnome-application-pdf.png +++ /dev/null diff --git a/icons/gnome-application-pgp-192.png b/icons/gnome-application-pgp-192.png Binary files differdeleted file mode 100644 index a90c8d62e..000000000 --- a/icons/gnome-application-pgp-192.png +++ /dev/null diff --git a/icons/gnome-application-pgp.png b/icons/gnome-application-pgp.png Binary files differdeleted file mode 100644 index f064af82d..000000000 --- a/icons/gnome-application-pgp.png +++ /dev/null diff --git a/icons/gnome-application-postscript-192.png b/icons/gnome-application-postscript-192.png Binary files differdeleted file mode 100644 index 87cb4bfb1..000000000 --- a/icons/gnome-application-postscript-192.png +++ /dev/null diff --git a/icons/gnome-application-postscript-72.png b/icons/gnome-application-postscript-72.png Binary files differdeleted file mode 100644 index 54371c84a..000000000 --- a/icons/gnome-application-postscript-72.png +++ /dev/null diff --git a/icons/gnome-application-postscript-96.png b/icons/gnome-application-postscript-96.png Binary files differdeleted file mode 100644 index 268e76419..000000000 --- a/icons/gnome-application-postscript-96.png +++ /dev/null diff --git a/icons/gnome-application-postscript.png b/icons/gnome-application-postscript.png Binary files differdeleted file mode 100644 index a83be2687..000000000 --- a/icons/gnome-application-postscript.png +++ /dev/null diff --git a/icons/gnome-application-x-c-header.png b/icons/gnome-application-x-c-header.png Binary files differdeleted file mode 100644 index bbecccc32..000000000 --- a/icons/gnome-application-x-c-header.png +++ /dev/null diff --git a/icons/gnome-application-x-c-source.png b/icons/gnome-application-x-c-source.png Binary files differdeleted file mode 100644 index 331e8420a..000000000 --- a/icons/gnome-application-x-c-source.png +++ /dev/null diff --git a/icons/gnome-application-x-cc-source.png b/icons/gnome-application-x-cc-source.png Binary files differdeleted file mode 100644 index 38dd1d6d4..000000000 --- a/icons/gnome-application-x-cc-source.png +++ /dev/null diff --git a/icons/gnome-application-x-e-theme.png b/icons/gnome-application-x-e-theme.png Binary files differdeleted file mode 100644 index d4594e974..000000000 --- a/icons/gnome-application-x-e-theme.png +++ /dev/null diff --git a/icons/gnome-application-x-generic-spreadsheet.png b/icons/gnome-application-x-generic-spreadsheet.png Binary files differdeleted file mode 100644 index 0da6f084c..000000000 --- a/icons/gnome-application-x-generic-spreadsheet.png +++ /dev/null diff --git a/icons/gnome-application-x-gnome-app-info.png b/icons/gnome-application-x-gnome-app-info.png Binary files differdeleted file mode 100644 index 2a16ec3b9..000000000 --- a/icons/gnome-application-x-gnome-app-info.png +++ /dev/null diff --git a/icons/gnome-application-x-java-source.png b/icons/gnome-application-x-java-source.png Binary files differdeleted file mode 100644 index 983208256..000000000 --- a/icons/gnome-application-x-java-source.png +++ /dev/null diff --git a/icons/gnome-application-x-kde-app-info.png b/icons/gnome-application-x-kde-app-info.png Binary files differdeleted file mode 100644 index d471b5dbe..000000000 --- a/icons/gnome-application-x-kde-app-info.png +++ /dev/null diff --git a/icons/gnome-application-x-php.png b/icons/gnome-application-x-php.png Binary files differdeleted file mode 100644 index 44d115f98..000000000 --- a/icons/gnome-application-x-php.png +++ /dev/null diff --git a/icons/gnome-application-x-reject.png b/icons/gnome-application-x-reject.png Binary files differdeleted file mode 100644 index bd4a4c422..000000000 --- a/icons/gnome-application-x-reject.png +++ /dev/null diff --git a/icons/gnome-application-x-scheme-source.png b/icons/gnome-application-x-scheme-source.png Binary files differdeleted file mode 100644 index a61aaa9d2..000000000 --- a/icons/gnome-application-x-scheme-source.png +++ /dev/null diff --git a/icons/gnome-application-x-sql.png b/icons/gnome-application-x-sql.png Binary files differdeleted file mode 100644 index 369b5730c..000000000 --- a/icons/gnome-application-x-sql.png +++ /dev/null diff --git a/icons/gnome-audio-basic.png b/icons/gnome-audio-basic.png Binary files differdeleted file mode 100644 index 173b0e188..000000000 --- a/icons/gnome-audio-basic.png +++ /dev/null diff --git a/icons/gnome-audio-midi.png b/icons/gnome-audio-midi.png Binary files differdeleted file mode 100644 index c575d10cc..000000000 --- a/icons/gnome-audio-midi.png +++ /dev/null diff --git a/icons/gnome-audio-ulaw.png b/icons/gnome-audio-ulaw.png Binary files differdeleted file mode 100644 index bf23222b7..000000000 --- a/icons/gnome-audio-ulaw.png +++ /dev/null diff --git a/icons/gnome-audio-x-aiff.png b/icons/gnome-audio-x-aiff.png Binary files differdeleted file mode 100644 index 6e5bb2a76..000000000 --- a/icons/gnome-audio-x-aiff.png +++ /dev/null diff --git a/icons/gnome-audio-x-mod-192.png b/icons/gnome-audio-x-mod-192.png Binary files differdeleted file mode 100644 index 8fa974d64..000000000 --- a/icons/gnome-audio-x-mod-192.png +++ /dev/null diff --git a/icons/gnome-audio-x-mod.png b/icons/gnome-audio-x-mod.png Binary files differdeleted file mode 100644 index 8b1c8745b..000000000 --- a/icons/gnome-audio-x-mod.png +++ /dev/null diff --git a/icons/gnome-audio-x-mp3-192.png b/icons/gnome-audio-x-mp3-192.png Binary files differdeleted file mode 100644 index 0d93f8513..000000000 --- a/icons/gnome-audio-x-mp3-192.png +++ /dev/null diff --git a/icons/gnome-audio-x-mp3.png b/icons/gnome-audio-x-mp3.png Binary files differdeleted file mode 100644 index 397c2c55f..000000000 --- a/icons/gnome-audio-x-mp3.png +++ /dev/null diff --git a/icons/gnome-audio-x-ogg-192.png b/icons/gnome-audio-x-ogg-192.png Binary files differdeleted file mode 100644 index a11e2adee..000000000 --- a/icons/gnome-audio-x-ogg-192.png +++ /dev/null diff --git a/icons/gnome-audio-x-ogg.png b/icons/gnome-audio-x-ogg.png Binary files differdeleted file mode 100644 index 949afd8cb..000000000 --- a/icons/gnome-audio-x-ogg.png +++ /dev/null diff --git a/icons/gnome-audio-x-pn-realaudio.png b/icons/gnome-audio-x-pn-realaudio.png Binary files differdeleted file mode 100644 index 14ee0d153..000000000 --- a/icons/gnome-audio-x-pn-realaudio.png +++ /dev/null diff --git a/icons/gnome-audio-x-real-192.png b/icons/gnome-audio-x-real-192.png Binary files differdeleted file mode 100644 index 10d571cb1..000000000 --- a/icons/gnome-audio-x-real-192.png +++ /dev/null diff --git a/icons/gnome-audio-x-s3m-192.png b/icons/gnome-audio-x-s3m-192.png Binary files differdeleted file mode 100644 index fd946fef4..000000000 --- a/icons/gnome-audio-x-s3m-192.png +++ /dev/null diff --git a/icons/gnome-audio-x-s3m.png b/icons/gnome-audio-x-s3m.png Binary files differdeleted file mode 100644 index 129ce218f..000000000 --- a/icons/gnome-audio-x-s3m.png +++ /dev/null diff --git a/icons/gnome-audio-x-stm-192.png b/icons/gnome-audio-x-stm-192.png Binary files differdeleted file mode 100644 index b65ba0836..000000000 --- a/icons/gnome-audio-x-stm-192.png +++ /dev/null diff --git a/icons/gnome-audio-x-stm.png b/icons/gnome-audio-x-stm.png Binary files differdeleted file mode 100644 index 43027de7a..000000000 --- a/icons/gnome-audio-x-stm.png +++ /dev/null diff --git a/icons/gnome-audio-x-voc.png b/icons/gnome-audio-x-voc.png Binary files differdeleted file mode 100644 index 04e826c11..000000000 --- a/icons/gnome-audio-x-voc.png +++ /dev/null diff --git a/icons/gnome-audio-x-wav.png b/icons/gnome-audio-x-wav.png Binary files differdeleted file mode 100644 index f5bdcffa1..000000000 --- a/icons/gnome-audio-x-wav.png +++ /dev/null diff --git a/icons/gnome-audio-x-xi-192.png b/icons/gnome-audio-x-xi-192.png Binary files differdeleted file mode 100644 index b9f28a374..000000000 --- a/icons/gnome-audio-x-xi-192.png +++ /dev/null diff --git a/icons/gnome-audio-x-xi.png b/icons/gnome-audio-x-xi.png Binary files differdeleted file mode 100644 index bc246255e..000000000 --- a/icons/gnome-audio-x-xi.png +++ /dev/null diff --git a/icons/gnome-audio-x-xm.png b/icons/gnome-audio-x-xm.png Binary files differdeleted file mode 100644 index f284892c0..000000000 --- a/icons/gnome-audio-x-xm.png +++ /dev/null diff --git a/icons/gnome-audio.png b/icons/gnome-audio.png Binary files differdeleted file mode 100644 index 4f97f9461..000000000 --- a/icons/gnome-audio.png +++ /dev/null diff --git a/icons/gnome-compressed-192.png b/icons/gnome-compressed-192.png Binary files differdeleted file mode 100644 index 7e051b51e..000000000 --- a/icons/gnome-compressed-192.png +++ /dev/null diff --git a/icons/gnome-compressed.png b/icons/gnome-compressed.png Binary files differdeleted file mode 100644 index f316e1f66..000000000 --- a/icons/gnome-compressed.png +++ /dev/null diff --git a/icons/gnome-core.png b/icons/gnome-core.png Binary files differdeleted file mode 100644 index 5ad601009..000000000 --- a/icons/gnome-core.png +++ /dev/null diff --git a/icons/gnome-emacs-192.png b/icons/gnome-emacs-192.png Binary files differdeleted file mode 100644 index d1db084ac..000000000 --- a/icons/gnome-emacs-192.png +++ /dev/null diff --git a/icons/gnome-font-afm.png b/icons/gnome-font-afm.png Binary files differdeleted file mode 100644 index f9d4e9b13..000000000 --- a/icons/gnome-font-afm.png +++ /dev/null diff --git a/icons/gnome-font-ttf.png b/icons/gnome-font-ttf.png Binary files differdeleted file mode 100644 index 8917c68ff..000000000 --- a/icons/gnome-font-ttf.png +++ /dev/null diff --git a/icons/gnome-font-x-pcf.png b/icons/gnome-font-x-pcf.png Binary files differdeleted file mode 100644 index a63070e42..000000000 --- a/icons/gnome-font-x-pcf.png +++ /dev/null diff --git a/icons/gnome-gimp.png b/icons/gnome-gimp.png Binary files differdeleted file mode 100644 index f6bbc6d36..000000000 --- a/icons/gnome-gimp.png +++ /dev/null diff --git a/icons/gnome-gnumeric.png b/icons/gnome-gnumeric.png Binary files differdeleted file mode 100644 index 3c47e564a..000000000 --- a/icons/gnome-gnumeric.png +++ /dev/null diff --git a/icons/gnome-http-url.png b/icons/gnome-http-url.png Binary files differdeleted file mode 100644 index 6e415888e..000000000 --- a/icons/gnome-http-url.png +++ /dev/null diff --git a/icons/gnome-image-bmp.png b/icons/gnome-image-bmp.png Binary files differdeleted file mode 100644 index fc07fe1fb..000000000 --- a/icons/gnome-image-bmp.png +++ /dev/null diff --git a/icons/gnome-image-generic.png b/icons/gnome-image-generic.png Binary files differdeleted file mode 100644 index e9aa5ee1e..000000000 --- a/icons/gnome-image-generic.png +++ /dev/null diff --git a/icons/gnome-image-gif.png b/icons/gnome-image-gif.png Binary files differdeleted file mode 100644 index 2521e9241..000000000 --- a/icons/gnome-image-gif.png +++ /dev/null diff --git a/icons/gnome-image-ief.png b/icons/gnome-image-ief.png Binary files differdeleted file mode 100644 index dc81e36a6..000000000 --- a/icons/gnome-image-ief.png +++ /dev/null diff --git a/icons/gnome-image-jpeg.png b/icons/gnome-image-jpeg.png Binary files differdeleted file mode 100644 index c8bbd105e..000000000 --- a/icons/gnome-image-jpeg.png +++ /dev/null diff --git a/icons/gnome-image-pbm.png b/icons/gnome-image-pbm.png Binary files differdeleted file mode 100644 index b6cde5cdf..000000000 --- a/icons/gnome-image-pbm.png +++ /dev/null diff --git a/icons/gnome-image-pgm.png b/icons/gnome-image-pgm.png Binary files differdeleted file mode 100644 index 174dd9170..000000000 --- a/icons/gnome-image-pgm.png +++ /dev/null diff --git a/icons/gnome-image-png.png b/icons/gnome-image-png.png Binary files differdeleted file mode 100644 index b9f0dee14..000000000 --- a/icons/gnome-image-png.png +++ /dev/null diff --git a/icons/gnome-image-pnm.png b/icons/gnome-image-pnm.png Binary files differdeleted file mode 100644 index 75e17ff0a..000000000 --- a/icons/gnome-image-pnm.png +++ /dev/null diff --git a/icons/gnome-image-ppm.png b/icons/gnome-image-ppm.png Binary files differdeleted file mode 100644 index 020a65701..000000000 --- a/icons/gnome-image-ppm.png +++ /dev/null diff --git a/icons/gnome-image-psd.png b/icons/gnome-image-psd.png Binary files differdeleted file mode 100644 index 8b096d271..000000000 --- a/icons/gnome-image-psd.png +++ /dev/null diff --git a/icons/gnome-image-ras.png b/icons/gnome-image-ras.png Binary files differdeleted file mode 100644 index a76607ae9..000000000 --- a/icons/gnome-image-ras.png +++ /dev/null diff --git a/icons/gnome-image-rgb.png b/icons/gnome-image-rgb.png Binary files differdeleted file mode 100644 index da65bc3e8..000000000 --- a/icons/gnome-image-rgb.png +++ /dev/null diff --git a/icons/gnome-image-tga.png b/icons/gnome-image-tga.png Binary files differdeleted file mode 100644 index 15f2fbdef..000000000 --- a/icons/gnome-image-tga.png +++ /dev/null diff --git a/icons/gnome-image-tiff.png b/icons/gnome-image-tiff.png Binary files differdeleted file mode 100644 index 794d6b4d9..000000000 --- a/icons/gnome-image-tiff.png +++ /dev/null diff --git a/icons/gnome-image-x-xfig.png b/icons/gnome-image-x-xfig.png Binary files differdeleted file mode 100644 index 2f8da4dae..000000000 --- a/icons/gnome-image-x-xfig.png +++ /dev/null diff --git a/icons/gnome-image-xbm.png b/icons/gnome-image-xbm.png Binary files differdeleted file mode 100644 index 6d7ae3296..000000000 --- a/icons/gnome-image-xbm.png +++ /dev/null diff --git a/icons/gnome-image-xcf.png b/icons/gnome-image-xcf.png Binary files differdeleted file mode 100644 index ed182cb05..000000000 --- a/icons/gnome-image-xcf.png +++ /dev/null diff --git a/icons/gnome-image-xpm.png b/icons/gnome-image-xpm.png Binary files differdeleted file mode 100644 index 1d15938ed..000000000 --- a/icons/gnome-image-xpm.png +++ /dev/null diff --git a/icons/gnome-image-xwd.png b/icons/gnome-image-xwd.png Binary files differdeleted file mode 100644 index 506e38c18..000000000 --- a/icons/gnome-image-xwd.png +++ /dev/null diff --git a/icons/gnome-library.png b/icons/gnome-library.png Binary files differdeleted file mode 100644 index 291c469f1..000000000 --- a/icons/gnome-library.png +++ /dev/null diff --git a/icons/gnome-manpage.png b/icons/gnome-manpage.png Binary files differdeleted file mode 100644 index 645cd34db..000000000 --- a/icons/gnome-manpage.png +++ /dev/null diff --git a/icons/gnome-objectfile.png b/icons/gnome-objectfile.png Binary files differdeleted file mode 100644 index 0ca43ea73..000000000 --- a/icons/gnome-objectfile.png +++ /dev/null diff --git a/icons/gnome-pack-deb.png b/icons/gnome-pack-deb.png Binary files differdeleted file mode 100644 index dc01776c8..000000000 --- a/icons/gnome-pack-deb.png +++ /dev/null diff --git a/icons/gnome-pack-rpm.png b/icons/gnome-pack-rpm.png Binary files differdeleted file mode 100644 index 32f14db66..000000000 --- a/icons/gnome-pack-rpm.png +++ /dev/null diff --git a/icons/gnome-package.png b/icons/gnome-package.png Binary files differdeleted file mode 100644 index b8988e7ba..000000000 --- a/icons/gnome-package.png +++ /dev/null diff --git a/icons/gnome-tex-192.png b/icons/gnome-tex-192.png Binary files differdeleted file mode 100644 index a522627be..000000000 --- a/icons/gnome-tex-192.png +++ /dev/null diff --git a/icons/gnome-tex.png b/icons/gnome-tex.png Binary files differdeleted file mode 100644 index caf414cec..000000000 --- a/icons/gnome-tex.png +++ /dev/null diff --git a/icons/gnome-text-html-192.png b/icons/gnome-text-html-192.png Binary files differdeleted file mode 100644 index f71ded82b..000000000 --- a/icons/gnome-text-html-192.png +++ /dev/null diff --git a/icons/gnome-text-html.png b/icons/gnome-text-html.png Binary files differdeleted file mode 100644 index ce297ece0..000000000 --- a/icons/gnome-text-html.png +++ /dev/null diff --git a/icons/gnome-text-x-authors.png b/icons/gnome-text-x-authors.png Binary files differdeleted file mode 100644 index ed63f2fb5..000000000 --- a/icons/gnome-text-x-authors.png +++ /dev/null diff --git a/icons/gnome-text-x-copying.png b/icons/gnome-text-x-copying.png Binary files differdeleted file mode 100644 index 721ee873f..000000000 --- a/icons/gnome-text-x-copying.png +++ /dev/null diff --git a/icons/gnome-text-x-credits.png b/icons/gnome-text-x-credits.png Binary files differdeleted file mode 100644 index fe2cca915..000000000 --- a/icons/gnome-text-x-credits.png +++ /dev/null diff --git a/icons/gnome-text-x-install.png b/icons/gnome-text-x-install.png Binary files differdeleted file mode 100644 index 048cd0b95..000000000 --- a/icons/gnome-text-x-install.png +++ /dev/null diff --git a/icons/gnome-text-x-makefile-192.png b/icons/gnome-text-x-makefile-192.png Binary files differdeleted file mode 100644 index 1266f47d4..000000000 --- a/icons/gnome-text-x-makefile-192.png +++ /dev/null diff --git a/icons/gnome-text-x-makefile.png b/icons/gnome-text-x-makefile.png Binary files differdeleted file mode 100644 index 9803e3f35..000000000 --- a/icons/gnome-text-x-makefile.png +++ /dev/null diff --git a/icons/gnome-text-x-readme.png b/icons/gnome-text-x-readme.png Binary files differdeleted file mode 100644 index 150a1d356..000000000 --- a/icons/gnome-text-x-readme.png +++ /dev/null diff --git a/icons/gnome-textfile.png b/icons/gnome-textfile.png Binary files differdeleted file mode 100644 index 7bb5584da..000000000 --- a/icons/gnome-textfile.png +++ /dev/null diff --git a/icons/gnome-video-mpeg.png b/icons/gnome-video-mpeg.png Binary files differdeleted file mode 100644 index fd5c659b6..000000000 --- a/icons/gnome-video-mpeg.png +++ /dev/null diff --git a/icons/gnome-video-quicktime.png b/icons/gnome-video-quicktime.png Binary files differdeleted file mode 100644 index 3f498c1d2..000000000 --- a/icons/gnome-video-quicktime.png +++ /dev/null diff --git a/icons/gnome-video-x-msvideo.png b/icons/gnome-video-x-msvideo.png Binary files differdeleted file mode 100644 index ad755e8a4..000000000 --- a/icons/gnome-video-x-msvideo.png +++ /dev/null diff --git a/icons/gnome-word-192.png b/icons/gnome-word-192.png Binary files differdeleted file mode 100644 index 2f232177f..000000000 --- a/icons/gnome-word-192.png +++ /dev/null diff --git a/icons/i-blockdev.png b/icons/i-blockdev.png Binary files differdeleted file mode 100644 index d840d4f64..000000000 --- a/icons/i-blockdev.png +++ /dev/null diff --git a/icons/i-cdrom-192.png b/icons/i-cdrom-192.png Binary files differdeleted file mode 100644 index 882d9680f..000000000 --- a/icons/i-cdrom-192.png +++ /dev/null diff --git a/icons/i-cdrom.png b/icons/i-cdrom.png Binary files differdeleted file mode 100644 index 949b7e930..000000000 --- a/icons/i-cdrom.png +++ /dev/null diff --git a/icons/i-chardev.png b/icons/i-chardev.png Binary files differdeleted file mode 100644 index 410d1ab5b..000000000 --- a/icons/i-chardev.png +++ /dev/null diff --git a/icons/i-core.png b/icons/i-core.png Binary files differdeleted file mode 100644 index 591c63cb4..000000000 --- a/icons/i-core.png +++ /dev/null diff --git a/icons/i-device.png b/icons/i-device.png Binary files differdeleted file mode 100644 index 447345921..000000000 --- a/icons/i-device.png +++ /dev/null diff --git a/icons/i-dirclosed.png b/icons/i-dirclosed.png Binary files differdeleted file mode 100644 index 8eef2948d..000000000 --- a/icons/i-dirclosed.png +++ /dev/null diff --git a/icons/i-executable.png b/icons/i-executable.png Binary files differdeleted file mode 100644 index 187eb940c..000000000 --- a/icons/i-executable.png +++ /dev/null diff --git a/icons/i-fifo.png b/icons/i-fifo.png Binary files differdeleted file mode 100644 index eb6840616..000000000 --- a/icons/i-fifo.png +++ /dev/null diff --git a/icons/i-floppy.png b/icons/i-floppy.png Binary files differdeleted file mode 100644 index 42c4f1a44..000000000 --- a/icons/i-floppy.png +++ /dev/null diff --git a/icons/i-harddisk.png b/icons/i-harddisk.png Binary files differdeleted file mode 100644 index 9184fa3f6..000000000 --- a/icons/i-harddisk.png +++ /dev/null diff --git a/icons/i-music-12.png b/icons/i-music-12.png Binary files differdeleted file mode 100644 index 37d1f25b0..000000000 --- a/icons/i-music-12.png +++ /dev/null diff --git a/icons/i-music-24.png b/icons/i-music-24.png Binary files differdeleted file mode 100644 index 3397725ab..000000000 --- a/icons/i-music-24.png +++ /dev/null diff --git a/icons/i-music-36.png b/icons/i-music-36.png Binary files differdeleted file mode 100644 index ad548104f..000000000 --- a/icons/i-music-36.png +++ /dev/null diff --git a/icons/i-music.png b/icons/i-music.png Binary files differdeleted file mode 100644 index bbd55c6ed..000000000 --- a/icons/i-music.png +++ /dev/null diff --git a/icons/i-nfs.png b/icons/i-nfs.png Binary files differdeleted file mode 100644 index 78f4fdbad..000000000 --- a/icons/i-nfs.png +++ /dev/null diff --git a/icons/i-printer.png b/icons/i-printer.png Binary files differdeleted file mode 100644 index b4dfab1b8..000000000 --- a/icons/i-printer.png +++ /dev/null diff --git a/icons/i-sock.png b/icons/i-sock.png Binary files differdeleted file mode 100644 index ee081a42b..000000000 --- a/icons/i-sock.png +++ /dev/null diff --git a/icons/i-zip.png b/icons/i-zip.png Binary files differdeleted file mode 100644 index 922781a8e..000000000 --- a/icons/i-zip.png +++ /dev/null diff --git a/icons/i-zipdisk.png b/icons/i-zipdisk.png Binary files differdeleted file mode 100644 index 5db9edb21..000000000 --- a/icons/i-zipdisk.png +++ /dev/null diff --git a/icons/i-zipdisk2.png b/icons/i-zipdisk2.png Binary files differdeleted file mode 100644 index 2e3199159..000000000 --- a/icons/i-zipdisk2.png +++ /dev/null diff --git a/libnautilus-private/nautilus-find-icon-image.c b/libnautilus-private/nautilus-find-icon-image.c index 7412427c3..eab7346b3 100644 --- a/libnautilus-private/nautilus-find-icon-image.c +++ b/libnautilus-private/nautilus-find-icon-image.c @@ -49,7 +49,8 @@ static const char *icon_file_name_suffixes[] = static char * make_full_icon_path (const char *path, const char *suffix, - gboolean theme_is_in_user_directory) + gboolean theme_is_in_user_directory, + gboolean document_type_icon) { char *partial_path, *full_path; char *user_directory, *themes_directory; @@ -67,6 +68,13 @@ make_full_icon_path (const char *path, full_path = nautilus_make_path (themes_directory, partial_path); g_free (user_directory); g_free (themes_directory); + + if (!g_file_exists (full_path)) { + g_free (full_path); + full_path = NULL; + } + } else if (document_type_icon) { + full_path = nautilus_make_path (DATADIR "/pixmaps/document-icons/", partial_path); if (!g_file_exists (full_path)) { g_free (full_path); full_path = NULL; @@ -79,6 +87,8 @@ make_full_icon_path (const char *path, full_path = gnome_vfs_icon_path_from_filename (partial_path); } + + g_free (partial_path); return full_path; } @@ -172,17 +182,23 @@ get_themed_icon_file_path (const NautilusIconTheme *icon_theme, NautilusIconDetails *details) { guint i; - gboolean include_size, in_user_directory; + gboolean include_size, in_user_directory, document_type_icon; char *themed_icon_name, *partial_path, *path, *xml_path; g_assert (icon_name != NULL); - if (icon_theme == NULL || icon_theme->name == NULL || icon_name[0] == '/') { + if (icon_name[0] == '/') { + themed_icon_name = g_strdup (icon_name); + in_user_directory = FALSE; + document_type_icon = FALSE; + } else if (icon_theme == NULL || icon_theme->name == NULL) { themed_icon_name = g_strdup (icon_name); in_user_directory = FALSE; + document_type_icon = TRUE; } else { themed_icon_name = g_strconcat (icon_theme->name, "/", icon_name, NULL); in_user_directory = icon_theme->is_in_user_directory; + document_type_icon = FALSE; } include_size = icon_size != NAUTILUS_ICON_SIZE_STANDARD; @@ -198,9 +214,11 @@ get_themed_icon_file_path (const NautilusIconTheme *icon_theme, partial_path = g_strdup (themed_icon_name); } + path = make_full_icon_path (partial_path, icon_file_name_suffixes[i], - in_user_directory); + in_user_directory, + document_type_icon); g_free (partial_path); /* Return the path if the file exists. */ @@ -216,7 +234,8 @@ get_themed_icon_file_path (const NautilusIconTheme *icon_theme, if (path != NULL && details != NULL) { xml_path = make_full_icon_path (themed_icon_name, ".xml", - in_user_directory); + in_user_directory, + document_type_icon); read_details (xml_path, icon_size, details); g_free (xml_path); } @@ -327,7 +346,7 @@ nautilus_get_icon_file_name (const NautilusIconThemeSpecifications *theme_specs, } theme = choose_theme (theme_specs, name); - + /* If there's a modifier, try the modified icon first. */ if (modifier != NULL && modifier[0] != '\0') { name_with_modifier = g_strconcat (name, "-", modifier, NULL); diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 6fb3ce3a6..5b5493389 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -833,6 +833,10 @@ icon_theme_changed_callback (gpointer user_data) } icon_fallback_theme = nautilus_theme_get_theme_data ("icon-images", "default_theme"); + if (icon_fallback_theme == NULL) { + icon_fallback_theme = g_strdup ("default"); + } + factory = get_icon_factory (); if (eel_strcmp (icon_theme, factory->theme.current.name) != 0 diff --git a/libnautilus-private/nautilus-theme.c b/libnautilus-private/nautilus-theme.c index 6f1b193db..0d1069cb7 100644 --- a/libnautilus-private/nautilus-theme.c +++ b/libnautilus-private/nautilus-theme.c @@ -44,10 +44,9 @@ #include <libgnomevfs/gnome-vfs.h> #include <librsvg/rsvg.h> -/* static globals to hold the last accessed and default theme files */ +/* static globals to hold the last accessed theme files */ static char *last_theme_name = NULL; static xmlDocPtr last_theme_document = NULL; -static xmlDocPtr default_theme_document = NULL; static char *theme_from_preferences = NULL; @@ -102,14 +101,9 @@ load_theme_document (const char *theme_name) char *theme_path, *temp_str; char *user_themes_directory; - /* formulate the theme path name */ - if (eel_str_is_equal (theme_name, "default")) { - theme_path = nautilus_pixmap_file ("default.xml"); - } else { - temp_str = g_strdup_printf("%s/%s.xml", theme_name, theme_name); - theme_path = nautilus_pixmap_file (temp_str); - g_free(temp_str); - } + temp_str = g_strdup_printf("%s/%s.xml", theme_name, theme_name); + theme_path = nautilus_pixmap_file (temp_str); + g_free(temp_str); /* if we can't find the theme document in the global area, try in the user's home */ if (theme_path == NULL) { @@ -147,12 +141,6 @@ free_last_theme (void) g_free (last_theme_name); } -static void -free_default_theme (void) -{ - xmlFreeDoc (default_theme_document); -} - /* Fetch data from the specified theme. Cache the last theme file as a parsed xml document */ char * @@ -194,24 +182,6 @@ nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char } } - /* if we couldn't find anything in the current theme, try the default theme */ - if (theme_data == NULL) { - if (default_theme_document == NULL) { - default_theme_document = load_theme_document ("default"); - eel_debug_call_at_shutdown (free_default_theme); - } - - resource_node = eel_xml_get_child_by_name (xmlDocGetRootElement (default_theme_document), resource_name); - if (resource_node) { - temp_str = xmlGetProp (resource_node, property_name); - if (temp_str) { - theme_data = g_strdup (temp_str); - xmlFree (temp_str); - } - } - - } - return theme_data; } @@ -259,30 +229,29 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th { char *image_path, *png_string, *temp_str; - if (!eel_str_is_equal (theme_name, "default")) { - temp_str = g_strdup_printf ("%s/%s", theme_name, image_name); - image_path = nautilus_pixmap_file_may_be_local (temp_str); + temp_str = g_strdup_printf ("%s/%s", theme_name, image_name); + image_path = nautilus_pixmap_file_may_be_local (temp_str); + + /* see if a theme-specific image exists; if so, return it */ + if (image_path) { + g_free (temp_str); + return image_path; + } + + /* try if with a .png extension if it doesn't already have one */ + if (!eel_istr_has_suffix (image_name, ".png")) { + png_string = g_strconcat (temp_str, ".png", NULL); + image_path = nautilus_pixmap_file_may_be_local (png_string); + g_free (png_string); - /* see if a theme-specific image exists; if so, return it */ if (image_path) { g_free (temp_str); return image_path; } - - /* try if with a .png extension if it doesn't already have one */ - if (!eel_istr_has_suffix (image_name, ".png")) { - png_string = g_strconcat (temp_str, ".png", NULL); - image_path = nautilus_pixmap_file_may_be_local (png_string); - g_free (png_string); - - if (image_path) { - g_free (temp_str); - return image_path; - } - } - g_free (temp_str); - } - + } + g_free (temp_str); + + /* we couldn't find a theme specific one, so look for a general image */ image_path = nautilus_pixmap_file (image_name); @@ -328,14 +297,7 @@ nautilus_theme_make_preview_pixbuf (const char *theme_name) GdkPixbuf *pixbuf; /* first, see if we can find an explicit preview */ - - /* FIXME: This special handling for "default" is a little weird */ - if (eel_str_is_equal (theme_name, "default")) { - theme_preview_name = g_strdup ("theme_preview.png"); - } else { - theme_preview_name = g_strdup_printf ("%s/%s", theme_name, "theme_preview.png"); - } - + theme_preview_name = g_strdup_printf ("%s/%s", theme_name, "theme_preview.png"); pixbuf_file = nautilus_pixmap_file (theme_preview_name); if (pixbuf_file != NULL) { pixbuf = gdk_pixbuf_new_from_file (pixbuf_file, NULL); @@ -440,12 +402,8 @@ has_image_file (const char *path_uri, char* image_uri; gboolean exists; - /* FIXME: This special handling for "default" is a little weird */ - if (eel_str_is_equal (dir_name, "default")) { - image_uri = g_strdup_printf ("%s/%s.png", path_uri, image_file); - } else { - image_uri = g_strdup_printf ("%s/%s/%s.png", path_uri, dir_name, image_file); - } + image_uri = g_strdup_printf ("%s/%s/%s.png", path_uri, dir_name, image_file); + exists = vfs_file_exists (image_uri); g_free (image_uri); @@ -453,12 +411,7 @@ has_image_file (const char *path_uri, return TRUE; } - /* FIXME: This special handling for "default" is a little weird */ - if (eel_str_is_equal (dir_name, "default")) { - image_uri = g_strdup_printf ("%s/%s.svg", path_uri, image_file); - } else { - image_uri = g_strdup_printf ("%s/%s/%s.svg", path_uri, dir_name, image_file); - } + image_uri = g_strdup_printf ("%s/%s/%s.svg", path_uri, dir_name, image_file); exists = vfs_file_exists (image_uri); g_free (image_uri); @@ -484,17 +437,10 @@ theme_get_property (const char *themes_location_uri, xml_result = NULL; result = NULL; - /* FIXME: This special handling for "default" is a little weird */ - if (eel_str_is_equal (theme_name, "default")) { - theme_file_uri = g_strdup_printf ("%s/%s.xml", - themes_location_uri, - theme_name); - } else { - theme_file_uri = g_strdup_printf ("%s/%s/%s.xml", - themes_location_uri, - theme_name, - theme_name); - } + theme_file_uri = g_strdup_printf ("%s/%s/%s.xml", + themes_location_uri, + theme_name, + theme_name); theme_file_name = gnome_vfs_get_local_path_from_uri (theme_file_uri); g_free (theme_file_uri); @@ -659,24 +605,6 @@ theme_get_user_themes (void) return user_themes; } -/* Even though there is just one default theme, we use the theme - * attribute list machinery for simplicity */ -static GList * -theme_get_default_themes (void) -{ - char *pixmap_directory; - char *pixmap_directory_uri; - GList *default_themes; - - pixmap_directory = nautilus_get_pixmap_directory (); - pixmap_directory_uri = gnome_vfs_get_uri_from_local_path (pixmap_directory); - default_themes = theme_list_prepend (NULL, pixmap_directory_uri, "default", TRUE); - g_free (pixmap_directory_uri); - g_free (pixmap_directory); - - return default_themes; -} - static void theme_list_invoke_callback (GList *theme_list, NautilusThemeCallback callback, @@ -732,19 +660,15 @@ nautilus_theme_for_each_theme (NautilusThemeCallback callback, { GList *builtin_themes; GList *user_themes; - GList *default_themes; g_return_if_fail (callback != NULL); builtin_themes = theme_get_builtin_themes (); user_themes = theme_get_user_themes (); - default_themes = theme_get_default_themes (); - theme_list_invoke_callback (default_themes, callback, callback_data); theme_list_invoke_callback (builtin_themes, callback, callback_data); theme_list_invoke_callback (user_themes, callback, callback_data); - eel_g_list_free_deep_custom (default_themes, attributes_free, NULL); eel_g_list_free_deep_custom (builtin_themes, attributes_free, NULL); eel_g_list_free_deep_custom (user_themes, attributes_free, NULL); } diff --git a/po/ChangeLog b/po/ChangeLog index 13941fbfb..67fb25b65 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,9 @@ +2002-01-22 Seth Nickell <snickell@stanford.edu> + + reviewed by: <delete if not using a buddy> + + * POTFILES.in: + 2002-01-22 Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz> * sk.po: Updated Slovak translation. diff --git a/po/POTFILES.in b/po/POTFILES.in index 65f1176bc..92a947781 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -40,7 +40,7 @@ data/static_bookmarks.xml data/sysconfig.desktop.in icons/crux_eggplant/crux_eggplant.xml icons/crux_teal/crux_teal.xml -icons/default.xml +icons/default/default.xml icons/gnome/gnome.xml icons/sierra/sierra.xml icons/tahoe/tahoe.xml |
