[nautilus: 10/10] Merge branch 'ui-polish'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 1eac9e307787d773ac1598d79df965d5be684f38
Merge: 2a20b38 7bce748
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Dec 3 19:25:41 2010 +0100

    Merge branch 'ui-polish'

 libnautilus-private/Makefile.am                    |    4 -
 libnautilus-private/nautilus-sidebar-provider.c    |   72 ---
 libnautilus-private/nautilus-sidebar-provider.h    |   56 --
 libnautilus-private/nautilus-sidebar.c             |  124 ----
 libnautilus-private/nautilus-sidebar.h             |   80 ---
 po/POTFILES.in                                     |    3 -
 src/Makefile.am                                    |   10 +-
 src/file-manager/Makefile.am                       |    4 -
 src/nautilus-application.c                         |   10 -
 src/nautilus-history-sidebar.c                     |  410 ------------
 src/nautilus-history-sidebar.h                     |   49 --
 src/nautilus-navigation-window-menus.c             |  101 +++-
 src/nautilus-navigation-window-ui.xml              |    7 +-
 src/nautilus-navigation-window.c                   |  645 ++++++++------------
 src/nautilus-navigation-window.h                   |   16 +-
 src/nautilus-notes-viewer.c                        |  518 ---------------
 src/nautilus-notes-viewer.h                        |   49 --
 src/nautilus-places-sidebar.c                      |   97 +---
 src/nautilus-places-sidebar.h                      |    3 +-
 src/nautilus-side-pane.c                           |  661 --------------------
 src/nautilus-side-pane.h                           |   76 ---
 ...-tree-model.c => nautilus-tree-sidebar-model.c} |    7 +-
 ...-tree-model.h => nautilus-tree-sidebar-model.h} |    0
 .../fm-tree-view.c => nautilus-tree-sidebar.c}     |  101 +---
 .../fm-tree-view.h => nautilus-tree-sidebar.h}     |    5 +-
 src/nautilus-window-private.h                      |    3 +-
 src/nautilus-window.h                              |    1 -
 27 files changed, 379 insertions(+), 2733 deletions(-)
---