[nautilus: 18/18] Merge branch 'style-context'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 1ee7fc84fe8232bfc57ba832642185b2829dcc8e
Merge: 1c31b7a b5302eb
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Dec 6 15:56:38 2010 +0100

    Merge branch 'style-context'

 eel/eel-canvas-rect-ellipse.c                      |  184 ++---------
 eel/eel-canvas-rect-ellipse.h                      |    4 +-
 eel/eel-canvas.c                                   |   43 +---
 eel/eel-canvas.h                                   |    7 -
 eel/eel-editable-label.c                           |   97 +++---
 eel/eel-gdk-extensions.c                           |  253 +--------------
 eel/eel-gdk-extensions.h                           |   52 +---
 eel/eel-gdk-pixbuf-extensions.c                    |   12 +-
 eel/eel-gdk-pixbuf-extensions.h                    |    2 +-
 eel/eel-graphic-effects.c                          |   14 +-
 eel/eel-graphic-effects.h                          |    5 +-
 eel/eel-gtk-extensions.c                           |    2 +-
 eel/eel-lib-self-check-functions.h                 |    1 -
 .../nautilus-file-conflict-dialog.c                |   15 +-
 libnautilus-private/nautilus-icon-canvas-item.c    |   78 +++---
 libnautilus-private/nautilus-icon-container.c      |  335 ++++++++------------
 libnautilus-private/nautilus-icon-dnd.c            |    4 +-
 libnautilus-private/nautilus-icon-private.h        |   16 +-
 libnautilus-private/nautilus-tree-view-drag-dest.c |    9 +-
 src/file-manager/fm-list-view.c                    |   63 +++-
 src/file-manager/fm-properties-window.c            |  104 +++----
 src/nautilus-location-bar.c                        |   18 +-
 src/nautilus-notebook.c                            |   32 ++-
 src/nautilus-spatial-window.c                      |    6 -
 src/nautilus-window.c                              |   39 ++-
 25 files changed, 475 insertions(+), 920 deletions(-)
---