[nautilus: 46/47] Merge branch 'refactor'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 9367d11d3a00d5192174f744eeea9e395fcd501a
Merge: 6430fd4 b13efe1
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Jan 11 16:52:51 2011 +0100

    Merge branch 'refactor'

 configure.in                                       |    1 -
 libnautilus-private/Makefile.am                    |   10 -
 libnautilus-private/nautilus-dnd.c                 |  306 --
 libnautilus-private/nautilus-dnd.h                 |   27 -
 libnautilus-private/nautilus-program-choosing.c    |    1 -
 libnautilus-private/nautilus-signaller.c           |    9 -
 libnautilus-private/nautilus-view.c                |  318 --
 libnautilus-private/nautilus-view.h                |  189 -
 libnautilus-private/nautilus-window-info.c         |  287 --
 libnautilus-private/nautilus-window-info.h         |  184 -
 libnautilus-private/nautilus-window-slot-info.c    |  157 -
 libnautilus-private/nautilus-window-slot-info.h    |  106 -
 src/Makefile.am                                    |   44 +-
 src/file-manager/Makefile.am                       |   92 -
 src/file-manager/fm-actions.h                      |  110 -
 src/file-manager/fm-desktop-icon-view.h            |   58 -
 src/file-manager/fm-directory-view.h               |  482 --
 src/file-manager/fm-empty-view.c                   |  397 --
 src/file-manager/fm-empty-view.h                   |   58 -
 src/file-manager/fm-icon-container.h               |   66 -
 src/file-manager/fm-icon-view.h                    |  133 -
 src/file-manager/fm-list-model.h                   |  136 -
 src/file-manager/fm-list-view.h                    |   61 -
 src/file-manager/fm-properties-window.h            |   67 -
 src/nautilus-actions.h                             |   79 +
 src/nautilus-application.c                         |   18 +-
 src/nautilus-application.h                         |    7 +-
 src/{file-manager => }/nautilus-audio-mime-types.h |    0
 src/nautilus-bookmarks-window.c                    |    3 +-
 src/nautilus-connect-server-dialog-main.c          |    1 -
 src/nautilus-connect-server-dialog-nonmain.c       |    6 +-
 src/nautilus-connect-server-dialog.c               |    9 +-
 src/nautilus-connect-server-dialog.h               |    2 +-
 .../nautilus-desktop-icon-view-ui.xml              |    0
 ...op-icon-view.c => nautilus-desktop-icon-view.c} |  217 +-
 src/nautilus-desktop-icon-view.h                   |   58 +
 ...m-page.c => nautilus-desktop-item-properties.c} |   41 +-
 ...m-page.h => nautilus-desktop-item-properties.h} |   12 +-
 .../nautilus-directory-view-ui.xml                 |    4 -
 src/nautilus-empty-view.c                          |  373 ++
 src/nautilus-empty-view.h                          |   58 +
 ...rror-reporting.c => nautilus-error-reporting.c} |  207 +-
 ...rror-reporting.h => nautilus-error-reporting.h} |   46 +-
 ...-container.c => nautilus-icon-view-container.c} |  174 +-
 src/nautilus-icon-view-container.h                 |   67 +
 src/{file-manager => }/nautilus-icon-view-ui.xml   |    0
 .../fm-icon-view.c => nautilus-icon-view.c}        | 1393 +++---
 src/nautilus-icon-view.h                           |  135 +
 .../fm-list-model.c => nautilus-list-model.c}      |  452 +-
 src/nautilus-list-model.h                          |  136 +
 ...view-private.h => nautilus-list-view-private.h} |    0
 src/{file-manager => }/nautilus-list-view-ui.xml   |    0
 .../fm-list-view.c => nautilus-list-view.c}        | 1007 ++---
 src/nautilus-list-view.h                           |   61 +
 src/nautilus-location-bar.c                        |    4 +-
 src/nautilus-main.c                                |    3 -
 .../nautilus-mime-actions.c                        |   71 +-
 .../nautilus-mime-actions.h                        |    8 +-
 src/nautilus-navigation-action.c                   |   47 +-
 src/nautilus-navigation-window-menus.c             |   22 +-
 src/nautilus-navigation-window-pane.c              |    8 +-
 src/nautilus-navigation-window-slot.c              |    1 -
 src/nautilus-navigation-window.c                   |   21 +-
 src/nautilus-notebook.c                            |   13 +-
 src/nautilus-pathbar.c                             |   18 +-
 src/nautilus-places-sidebar.c                      |  104 +-
 src/nautilus-places-sidebar.h                      |    6 +-
 ...rties-window.c => nautilus-properties-window.c} |  352 +-
 src/nautilus-properties-window.h                   |   67 +
 src/nautilus-query-editor.h                        |    7 +-
 src/nautilus-spatial-window.c                      |   26 +-
 src/nautilus-trash-bar.c                           |   51 +-
 src/nautilus-trash-bar.h                           |    4 +-
 src/nautilus-tree-sidebar.c                        |   45 +-
 src/nautilus-tree-sidebar.h                        |    4 +-
 src/nautilus-view-as-action.c                      |    6 +-
 src/nautilus-view-dnd.c                            |  579 +++
 src/nautilus-view-dnd.h                            |   68 +
 .../nautilus-view-factory.c                        |    2 +-
 .../nautilus-view-factory.h                        |    9 +-
 .../fm-directory-view.c => nautilus-view.c}        | 4854 ++++++++------------
 src/nautilus-view.h                                |  414 ++
 src/nautilus-window-manage-views.c                 |  174 +-
 src/nautilus-window-manage-views.h                 |    5 -
 src/nautilus-window-menus.c                        |   23 +-
 src/nautilus-window-pane.h                         |    7 +-
 src/nautilus-window-private.h                      |    2 +
 src/nautilus-window-slot-dnd.c                     |  371 ++
 src/nautilus-window-slot-dnd.h                     |   41 +
 src/nautilus-window-slot.c                         |  316 +-
 src/nautilus-window-slot.h                         |   67 +-
 src/nautilus-window-types.h                        |   57 +
 src/nautilus-window.c                              |  267 +-
 src/nautilus-window.h                              |   73 +-
 src/nautilus-x-content-bar.c                       |    2 +-
 95 files changed, 7013 insertions(+), 9071 deletions(-)
---