[nautilus: 29/29] Merge branch 'remove-emblems-splitted'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 915e5523947fe049e06f9bd8574760f6765e8ad7
Merge: 84b89c5 e50565b
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jul 26 18:02:15 2010 +0200

    Merge branch 'remove-emblems-splitted'

 configure.in                                       |    1 -
 data/Makefile.am                                   |    2 -
 data/browser.xml                                   |   76 -
 data/patterns/Makefile.am                          |   39 -
 data/patterns/blue_gray_rough.png                  |  Bin 22418 -> 0 bytes
 data/patterns/blue_ridge.png                       |  Bin 263 -> 0 bytes
 data/patterns/blue_type.png                        |  Bin 11060 -> 0 bytes
 data/patterns/brushed_metal.png                    |  Bin 29181 -> 0 bytes
 data/patterns/burlap.jpg                           |  Bin 1611 -> 0 bytes
 data/patterns/camouflage.png                       |  Bin 29561 -> 0 bytes
 data/patterns/chalk.jpg                            |  Bin 821 -> 0 bytes
 data/patterns/cork.png                             |  Bin 20928 -> 0 bytes
 data/patterns/countertop.png                       |  Bin 4787 -> 0 bytes
 data/patterns/dark-gnome.jpg                       |  Bin 9877 -> 0 bytes
 data/patterns/dots.png                             |  Bin 922 -> 0 bytes
 data/patterns/fibers.png                           |  Bin 28188 -> 0 bytes
 data/patterns/fleur_de_lis.png                     |  Bin 28890 -> 0 bytes
 data/patterns/floral.png                           |  Bin 73080 -> 0 bytes
 data/patterns/fossil.png                           |  Bin 14478 -> 0 bytes
 data/patterns/gnome.jpg                            |  Bin 8316 -> 0 bytes
 data/patterns/green_weave.png                      |  Bin 8088 -> 0 bytes
 data/patterns/ice.png                              |  Bin 19562 -> 0 bytes
 data/patterns/manila_paper.png                     |  Bin 21751 -> 0 bytes
 data/patterns/moss_ridge.png                       |  Bin 274 -> 0 bytes
 data/patterns/numbers.png                          |  Bin 8993 -> 0 bytes
 data/patterns/ocean_stripes.png                    |  Bin 274 -> 0 bytes
 data/patterns/purple_marble.png                    |  Bin 12288 -> 0 bytes
 data/patterns/reset.png                            |  Bin 441 -> 0 bytes
 data/patterns/ridged_paper.png                     |  Bin 10353 -> 0 bytes
 data/patterns/rough_paper.png                      |  Bin 3955 -> 0 bytes
 data/patterns/sky_ridge.png                        |  Bin 264 -> 0 bytes
 data/patterns/snow_ridge.png                       |  Bin 274 -> 0 bytes
 data/patterns/stucco.jpg                           |  Bin 2499 -> 0 bytes
 data/patterns/terracotta.png                       |  Bin 32001 -> 0 bytes
 data/patterns/wavy_white.png                       |  Bin 1522 -> 0 bytes
 eel/Makefile.am                                    |   10 -
 eel/eel-background-box.c                           |   70 -
 eel/eel-background-box.h                           |   67 -
 eel/eel-image-table.c                              |  579 -----
 eel/eel-image-table.h                              |   95 -
 eel/eel-labeled-image.c                            | 2375 --------------------
 eel/eel-labeled-image.h                            |  162 --
 eel/eel-wrap-table.c                               | 1067 ---------
 eel/eel-wrap-table.h                               |  104 -
 eel/eel-xml-extensions.c                           |  184 --
 eel/eel-xml-extensions.h                           |   49 -
 eel/eel.h                                          |    4 -
 icons/Makefile.am                                  |    5 -
 icons/backgrounds.png                              |  Bin 3735 -> 0 bytes
 icons/chit_frame.png                               |  Bin 751 -> 0 bytes
 icons/colors.png                                   |  Bin 3115 -> 0 bytes
 icons/emblems.png                                  |  Bin 3122 -> 0 bytes
 icons/erase.png                                    |  Bin 3441 -> 0 bytes
 libnautilus-private/Makefile.am                    |    4 -
 libnautilus-private/nautilus-customization-data.c  |  464 ----
 libnautilus-private/nautilus-customization-data.h  |   68 -
 libnautilus-private/nautilus-dnd.h                 |    4 -
 libnautilus-private/nautilus-emblem-utils.c        |  473 ----
 libnautilus-private/nautilus-emblem-utils.h        |   53 -
 libnautilus-private/nautilus-file-dnd.c            |   31 -
 libnautilus-private/nautilus-file-dnd.h            |    2 -
 libnautilus-private/nautilus-file-private.h        |    9 -
 libnautilus-private/nautilus-file.c                |  135 +--
 libnautilus-private/nautilus-file.h                |    5 -
 libnautilus-private/nautilus-icon-dnd.c            |   68 +-
 libnautilus-private/nautilus-icon-names.h          |    5 -
 libnautilus-private/nautilus-tree-view-drag-dest.c |   38 -
 .../org.gnome.nautilus.gschema.xml.in              |    7 +-
 src/Makefile.am                                    |    8 -
 src/file-manager/fm-icon-view.c                    |   13 +-
 src/file-manager/fm-list-view.c                    |    1 -
 src/file-manager/fm-properties-window.c            |  309 ---
 src/file-manager/nautilus-icon-view-ui.xml         |    2 -
 src/nautilus-application.c                         |    4 -
 src/nautilus-emblem-sidebar.c                      | 1110 ---------
 src/nautilus-emblem-sidebar.h                      |   61 -
 src/nautilus-file-management-properties.c          |    1 -
 src/nautilus-file-management-properties.ui         |    3 -
 src/nautilus-information-panel.c                   | 1225 ----------
 src/nautilus-information-panel.h                   |   64 -
 src/nautilus-navigation-window-menus.c             |    2 -
 src/nautilus-navigation-window.h                   |    1 -
 src/nautilus-property-browser.c                    | 2308 -------------------
 src/nautilus-property-browser.h                    |   71 -
 src/nautilus-shell-ui.xml                          |    1 -
 src/nautilus-sidebar-title.c                       |  692 ------
 src/nautilus-sidebar-title.h                       |   76 -
 src/nautilus-window-menus.c                        |   16 -
 src/nautilus-window.c                              |    1 -
 src/nautilus-window.h                              |    1 -
 test/Makefile.am                                   |    7 -
 test/test-eel-image-table.c                        |  304 ---
 test/test-eel-labeled-image.c                      |   79 -
 test/test-eel-pixbuf-scale.c                       |    1 +
 test/test-nautilus-wrap-table.c                    |   96 -
 95 files changed, 6 insertions(+), 12706 deletions(-)
---