[nautilus/undo-manager: 94/98] Merge branch 'master' into undo-manager

[Cosimo Cecchi <cosimoc src gnome org>]

commit afc3238339bcec371c9741d9d882fa82eb6de53a
Merge: 14b136e eea53d2
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Dec 7 11:11:45 2010 +0100

    Merge branch 'master' into undo-manager

 NEWS                                               |   19 +
 configure.in                                       |   24 +-
 docs/Makefile.am                                   |    1 -
 docs/nautilus-file-management-properties.1         |   49 -
 eel/Makefile.am                                    |    1 -
 eel/eel-canvas-rect-ellipse.c                      |  186 +-
 eel/eel-canvas-rect-ellipse.h                      |    4 +-
 eel/eel-canvas.c                                   |   43 +-
 eel/eel-canvas.h                                   |    7 -
 eel/eel-debug.c                                    |   27 +-
 eel/eel-debug.h                                    |    2 -
 eel/eel-editable-label.c                           |  311 +-
 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 -
 libnautilus-extension/Makefile.am                  |   12 +-
 .../libnautilus-extension-uninstalled.pc.in        |    4 +-
 libnautilus-extension/libnautilus-extension.pc.in  |    2 +-
 libnautilus-private/Makefile.am                    |   21 +-
 libnautilus-private/nautilus-dbus-manager.c        |  302 +
 libnautilus-private/nautilus-dbus-manager.h        |   32 +
 libnautilus-private/nautilus-debug-log.c           |  721 --
 libnautilus-private/nautilus-debug-log.h           |   58 -
 libnautilus-private/nautilus-debug.c               |  160 +
 libnautilus-private/nautilus-debug.h               |   90 +
 .../nautilus-file-conflict-dialog.c                |   19 +-
 libnautilus-private/nautilus-file-operations.c     |   88 +-
 libnautilus-private/nautilus-file-operations.h     |    7 +
 libnautilus-private/nautilus-file.c                |   18 +-
 libnautilus-private/nautilus-icon-canvas-item.c    |   76 +-
 libnautilus-private/nautilus-icon-container.c      |  385 +-
 libnautilus-private/nautilus-icon-container.h      |    1 -
 libnautilus-private/nautilus-icon-dnd.c            |   22 +-
 libnautilus-private/nautilus-icon-info.c           |    8 +-
 libnautilus-private/nautilus-icon-private.h        |   16 +-
 libnautilus-private/nautilus-mime-actions.c        |  160 +-
 libnautilus-private/nautilus-mime-actions.h        |    3 -
 .../nautilus-mime-application-chooser.c            |  913 +--
 .../nautilus-mime-application-chooser.h            |    7 +-
 libnautilus-private/nautilus-open-with-dialog.c    | 1075 ---
 libnautilus-private/nautilus-open-with-dialog.h    |   64 -
 libnautilus-private/nautilus-program-choosing.c    |  110 +-
 .../nautilus-search-engine-beagle.c                |  424 --
 .../nautilus-search-engine-beagle.h                |   51 -
 libnautilus-private/nautilus-search-engine.c       |    6 -
 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 -
 libnautilus-private/nautilus-tree-view-drag-dest.c |   31 +-
 libnautilus-private/nautilus.convert               |    8 -
 .../org.gnome.media-handling.gschema.xml.in        |   34 -
 .../org.gnome.nautilus.gschema.xml.in              |    4 -
 nautilus-sendto-extension/Makefile.am              |    2 +-
 po/POTFILES.in                                     |   11 +-
 po/es.po                                           | 1876 +++---
 po/gl.po                                           | 2202 +++---
 po/he.po                                           | 2652 ++++----
 po/ro.po                                           | 7376 ++++++++++----------
 po/sv.po                                           | 3701 +++++-----
 src/Makefile.am                                    |   10 +-
 src/file-manager/Makefile.am                       |    4 -
 src/file-manager/fm-directory-view.c               |  102 +-
 src/file-manager/fm-error-reporting.c              |    8 +-
 src/file-manager/fm-icon-container.c               |   53 +-
 src/file-manager/fm-list-view.c                    |   77 +-
 src/file-manager/fm-properties-window.c            |  119 +-
 src/nautilus-application-smclient.c                |   40 +-
 src/nautilus-application.c                         |   79 +-
 src/nautilus-connect-server-dialog-main.c          |   26 +-
 src/nautilus-desktop-window.c                      |    2 +-
 src/nautilus-file-management-properties.c          |   37 +-
 src/nautilus-file-management-properties.h          |    2 +-
 src/nautilus-history-sidebar.c                     |  410 --
 src/nautilus-history-sidebar.h                     |   49 -
 src/nautilus-location-bar.c                        |   18 +-
 src/nautilus-main.c                                |  179 +-
 src/nautilus-navigation-window-menus.c             |  101 +-
 src/nautilus-navigation-window-ui.xml              |    7 +-
 src/nautilus-navigation-window.c                   |  647 +--
 src/nautilus-navigation-window.h                   |   16 +-
 src/nautilus-notebook.c                            |   32 +-
 src/nautilus-notes-viewer.c                        |  518 --
 src/nautilus-notes-viewer.h                        |   49 -
 src/nautilus-places-sidebar.c                      |  106 +-
 src/nautilus-places-sidebar.h                      |    3 +-
 src/nautilus-query-editor.c                        |    1 +
 src/nautilus-side-pane.c                           |  661 --
 src/nautilus-side-pane.h                           |   76 -
 src/nautilus-spatial-window.c                      |    6 -
 ...-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}     |  123 +-
 .../fm-tree-view.h => nautilus-tree-sidebar.h}     |    5 +-
 src/nautilus-window-manage-views.c                 |   19 +-
 src/nautilus-window-menus.c                        |   11 +-
 src/nautilus-window-private.h                      |    3 +-
 src/nautilus-window.c                              |   41 +-
 src/nautilus-window.h                              |    1 -
 104 files changed, 11229 insertions(+), 16518 deletions(-)
---
diff --cc src/file-manager/fm-directory-view.c
index 5cf0aca,dbda0ed..fe67709
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@@ -77,8 -75,10 +75,11 @@@
  #include <libnautilus-private/nautilus-ui-utilities.h>
  #include <libnautilus-private/nautilus-signaller.h>
  #include <libnautilus-private/nautilus-icon-names.h>
 +#include <libnautilus-private/nautilus-undostack-manager.h>
  
+ #define DEBUG_FLAG NAUTILUS_DEBUG_DIRECTORY_VIEW
+ #include <libnautilus-private/nautilus-debug.h>
+ 
  /* Minimum starting update inverval */
  #define UPDATE_INTERVAL_MIN 100
  /* Maximum update interval */