[nautilus: 9/9] Merge branch 'background-untangling'

[Cosimo Cecchi <cosimoc src gnome org>]

commit d4342547ebc2e26547cf8f1449bfd2e8fe4c443f
Merge: eda5d36 66cd22c
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sat Oct 9 19:39:22 2010 +0200

    Merge branch 'background-untangling'

 eel/Makefile.am                                    |    2 -
 eel/eel-background.c                               | 1054 --------------------
 eel/eel-background.h                               |  149 ---
 eel/eel-gdk-extensions.c                           |   30 +
 eel/eel-gdk-extensions.h                           |    2 +
 eel/eel-lib-self-check-functions.h                 |    1 -
 eel/eel.h                                          |    1 -
 libnautilus-private/Makefile.am                    |    4 +-
 libnautilus-private/nautilus-autorun.h             |    1 -
 libnautilus-private/nautilus-desktop-background.c  |  586 +++++++++++
 libnautilus-private/nautilus-desktop-background.h  |   68 ++
 .../nautilus-directory-background.c                |  351 -------
 .../nautilus-directory-background.h                |   29 -
 libnautilus-private/nautilus-icon-container.c      |   84 +-
 libnautilus-private/nautilus-icon-container.h      |    2 +
 libnautilus-private/nautilus-icon-dnd.c            |    8 +-
 libnautilus-private/nautilus-icon-private.h        |    1 +
 src/file-manager/fm-desktop-icon-view.c            |   10 +-
 src/file-manager/fm-directory-view.c               |   34 -
 src/file-manager/fm-directory-view.h               |    2 -
 src/file-manager/fm-empty-view.c                   |    7 -
 src/file-manager/fm-icon-view.c                    |   20 +-
 src/file-manager/fm-list-view.c                    |   28 +-
 test/Makefile.am                                   |    3 -
 test/test.c                                        |   33 -
 25 files changed, 761 insertions(+), 1749 deletions(-)
---