[nautilus/places-sidebar: 369/371] Merge branch 'master' into places-sidebar
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/places-sidebar: 369/371] Merge branch 'master' into places-sidebar
- Date: Sun, 21 Apr 2013 16:47:55 +0000 (UTC)
commit cb0c3152f5d23a272a4889dd7fcf24c2e6f5da22
Merge: 022b922 82014e7
Author: Federico Mena Quintero <federico gnome org>
Date: Sat Apr 20 15:14:08 2013 -0400
Merge branch 'master' into places-sidebar
Conflicts:
src/nautilus-places-sidebar.c
Makefile.am | 2 -
NEWS | 127 +
autogen.sh | 2 +-
configure.in => configure.ac | 60 +-
cut-n-paste-code/Makefile.am | 4 -
cut-n-paste-code/README | 21 -
cut-n-paste-code/libegg/Makefile.am | 33 -
cut-n-paste-code/libegg/eggtreemultidnd.c | 415 -
cut-n-paste-code/libegg/eggtreemultidnd.h | 74 -
cut-n-paste-code/libegg/update-from-egg.sh | 25 -
data/Makefile.am | 6 +-
data/freedesktop-dbus-interfaces.xml | 1 +
data/nautilus-classic.desktop.in | 15 +
data/nautilus-search-provider.ini | 1 +
data/nautilus.desktop.in.in | 4 +-
data/org.gnome.Nautilus.SearchProvider.service.in | 2 +-
data/shell-search-provider-dbus-interfaces.xml | 8 +-
docs/reference/libnautilus-extension/Makefile.am | 7 -
eel/Makefile.am | 2 +-
eel/eel-accessibility.c | 104 -
eel/eel-accessibility.h | 6 -
eel/eel-canvas.c | 402 +-
eel/eel-canvas.h | 5 +-
eel/eel-editable-label.c | 228 +-
eel/eel-glib-extensions.c | 120 +-
eel/eel-glib-extensions.h | 8 -
eel/eel-gnome-extensions.c | 138 +-
eel/eel-gtk-extensions.c | 51 -
eel/eel-gtk-extensions.h | 4 -
icons/Makefile.am | 10 -
libnautilus-extension/Makefile.am | 2 +-
libnautilus-extension/nautilus-menu-provider.c | 4 +-
libnautilus-private/Makefile.am | 12 +-
libnautilus-private/nautilus-canvas-container.c | 140 +-
libnautilus-private/nautilus-canvas-container.h | 4 +
libnautilus-private/nautilus-canvas-dnd.c | 153 +-
libnautilus-private/nautilus-canvas-dnd.h | 4 +-
libnautilus-private/nautilus-canvas-item.c | 9 +-
libnautilus-private/nautilus-canvas-private.h | 2 +
libnautilus-private/nautilus-clipboard-monitor.c | 6 +-
libnautilus-private/nautilus-clipboard.c | 8 +-
libnautilus-private/nautilus-clipboard.h | 2 +-
libnautilus-private/nautilus-column-chooser.c | 6 +-
libnautilus-private/nautilus-dbus-manager.c | 148 +-
libnautilus-private/nautilus-dbus-manager.h | 7 +-
libnautilus-private/nautilus-desktop-background.c | 599 --
libnautilus-private/nautilus-desktop-background.h | 68 -
libnautilus-private/nautilus-desktop-directory.c | 6 +-
.../nautilus-desktop-link-monitor.c | 6 +-
libnautilus-private/nautilus-desktop-link.c | 2 +-
libnautilus-private/nautilus-directory-async.c | 156 +-
libnautilus-private/nautilus-directory-private.h | 5 -
libnautilus-private/nautilus-directory.c | 14 +-
libnautilus-private/nautilus-dnd.c | 93 +-
libnautilus-private/nautilus-dnd.h | 12 +
libnautilus-private/nautilus-entry.c | 2 +-
libnautilus-private/nautilus-file-operations.c | 68 +-
libnautilus-private/nautilus-file-operations.h | 1 +
.../nautilus-file-undo-operations.c | 15 +-
libnautilus-private/nautilus-file-utilities.c | 160 +-
libnautilus-private/nautilus-file-utilities.h | 2 +
libnautilus-private/nautilus-file.c | 99 +-
libnautilus-private/nautilus-global-preferences.c | 4 +
libnautilus-private/nautilus-global-preferences.h | 8 +-
libnautilus-private/nautilus-icon-info.c | 8 +-
.../nautilus-mime-application-chooser.c | 8 +-
libnautilus-private/nautilus-query.c | 11 +-
libnautilus-private/nautilus-search-directory.c | 71 +-
libnautilus-private/nautilus-search-engine-model.c | 20 +-
.../nautilus-search-engine-simple.c | 6 +-
.../nautilus-search-engine-simple.h | 2 -
.../nautilus-search-engine-tracker.c | 4 +-
libnautilus-private/nautilus-search-engine.c | 12 +-
libnautilus-private/nautilus-search-engine.h | 3 +
libnautilus-private/nautilus-search-hit.c | 3 +
libnautilus-private/nautilus-search-provider.c | 2 +
libnautilus-private/nautilus-signaller.c | 8 +-
libnautilus-private/nautilus-thumbnails.c | 2 +-
libnautilus-private/nautilus-trash-monitor.c | 2 +-
libnautilus-private/nautilus-tree-view-drag-dest.c | 218 +-
libnautilus-private/nautilus-tree-view-drag-dest.h | 2 +
libnautilus-private/nautilus-ui-utilities.c | 9 -
.../org.gnome.nautilus.gschema.xml.in | 9 +-
nautilus-sendto-extension/Makefile.am | 2 +-
nautilus-sendto-extension/nautilus-nste.c | 8 +-
po/LINGUAS | 1 +
po/POTFILES.in | 2 +-
po/ar.po | 1998 ++---
po/as.po | 2383 +++---
po/be.po | 2034 ++---
po/ca.po | 2012 ++---
po/ca valencia po | 2026 ++---
po/cs.po | 1865 ++---
po/da.po | 1756 ++--
po/de.po | 2297 +++---
po/el.po | 2566 +++---
po/en_GB.po | 2000 ++---
po/es.po | 1995 ++---
po/et.po | 369 +-
po/eu.po | 6831 ++++++++--------
po/fa.po | 2788 +++----
po/fi.po | 2114 ++---
po/fr.po | 2630 +++---
po/ga.po | 5555 ++++++-------
po/gl.po | 1750 ++--
po/gu.po | 2264 +++---
po/he.po | 1846 +++--
po/hi.po | 2432 +++---
po/hu.po | 1947 ++---
po/id.po | 1996 ++---
po/it.po | 4627 +++++------
po/ja.po | 2006 ++---
po/kn.po | 2637 +++---
po/ko.po | 2234 +++---
po/lt.po | 2013 ++---
po/lv.po | 1828 +++--
po/ml.po | 2556 +++---
po/mr.po | 2050 ++---
po/nb.po | 1657 ++--
po/nl.po | 5860 +++++++-------
po/or.po | 8412 +++++++++++---------
po/pa.po | 1988 ++---
po/pl.po | 2000 ++---
po/pt.po | 2453 +++---
po/pt_BR.po | 2209 ++---
po/ru.po | 3041 +++----
po/sk.po | 2343 +++---
po/sl.po | 1904 ++---
po/sr.po | 2014 ++---
po/sr latin po | 2014 ++---
po/ta.po | 3009 +++----
po/te.po | 2708 ++++---
po/tg.po | 5386 +++++++++++++
po/ug.po | 7191 +++++++++--------
po/uk.po | 1769 ++--
po/vi.po | 2809 +++----
po/zh_CN.po | 2669 ++++---
po/zh_HK.po | 2382 +++---
po/zh_TW.po | 2528 +++---
src/Makefile.am | 63 +-
src/nautilus-actions.h | 2 +-
src/nautilus-app-menu.ui | 9 +-
src/nautilus-application.c | 559 +-
src/nautilus-application.h | 5 +
src/nautilus-bookmarks-window.c | 4 +-
src/nautilus-canvas-view-ui.xml | 2 +-
src/nautilus-canvas-view.c | 247 +-
src/nautilus-canvas-view.h | 4 +-
src/nautilus-convert-metadata.c | 2 -
src/nautilus-desktop-canvas-view.c | 200 +-
src/nautilus-desktop-canvas-view.h | 4 +-
src/nautilus-desktop-item-properties.c | 6 +-
src/nautilus-desktop-window.c | 53 +-
src/nautilus-directory-view-ui.xml | 8 +-
src/nautilus-empty-view.c | 64 +-
src/nautilus-empty-view.h | 4 +-
src/nautilus-file-management-properties.c | 8 +-
src/nautilus-file-management-properties.ui | 52 +-
src/nautilus-freedesktop-dbus.c | 138 +-
src/nautilus-freedesktop-dbus.h | 27 +-
src/nautilus-image-properties-page.c | 6 +-
src/nautilus-list-model.c | 194 +-
src/nautilus-list-model.h | 3 +
src/nautilus-list-view-ui.xml | 2 +-
src/nautilus-list-view.c | 729 +-
src/nautilus-list-view.h | 4 +-
src/nautilus-location-entry.c | 8 +-
src/nautilus-main.c | 13 +-
src/nautilus-mime-actions.c | 57 +-
src/nautilus-mime-actions.h | 1 +
src/nautilus-notebook.c | 18 +-
src/nautilus-notebook.h | 9 +-
src/nautilus-pathbar.c | 10 +-
src/nautilus-progress-ui-handler.c | 4 +
src/nautilus-properties-window.c | 19 +-
src/nautilus-query-editor.c | 207 +-
src/nautilus-shell-search-provider.c | 251 +-
src/nautilus-shell-search-provider.h | 38 +
src/nautilus-shell-ui.xml | 4 +-
src/nautilus-special-location-bar.c | 2 +-
src/nautilus-toolbar.c | 120 +-
src/nautilus-trash-bar.c | 3 +-
src/nautilus-view-dnd.c | 14 +
src/nautilus-view-dnd.h | 2 +
src/nautilus-view-factory.c | 121 -
src/nautilus-view-factory.h | 71 -
src/nautilus-view.c | 219 +-
src/nautilus-view.h | 13 +-
src/nautilus-window-manage-views.c | 1806 -----
src/nautilus-window-manage-views.h | 38 -
src/nautilus-window-menus.c | 29 +-
src/nautilus-window-private.h | 14 -
src/nautilus-window-slot-dnd.c | 102 +
src/nautilus-window-slot.c | 2442 +++++-
src/nautilus-window-slot.h | 139 +-
src/nautilus-window-types.h | 49 -
src/nautilus-window.c | 346 +-
src/nautilus-window.h | 54 +-
198 files changed, 80468 insertions(+), 74030 deletions(-)
---
diff --cc src/nautilus-window.c
index 73195bd,52ca70c..18b1f41
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@@ -38,11 -38,9 +38,9 @@@
#include "nautilus-location-entry.h"
#include "nautilus-mime-actions.h"
#include "nautilus-notebook.h"
-#include "nautilus-places-sidebar.h"
#include "nautilus-pathbar.h"
+#include "nautilus-properties-window.h"
#include "nautilus-toolbar.h"
- #include "nautilus-view-factory.h"
- #include "nautilus-window-manage-views.h"
#include "nautilus-window-slot.h"
#include "nautilus-list-view.h"
#include "nautilus-canvas-view.h"
@@@ -66,9 -61,7 +64,8 @@@
#include <libnautilus-private/nautilus-metadata.h>
#include <libnautilus-private/nautilus-profile.h>
#include <libnautilus-private/nautilus-clipboard.h>
- #include <libnautilus-private/nautilus-search-directory.h>
#include <libnautilus-private/nautilus-signaller.h>
+#include <libnautilus-private/nautilus-trash-monitor.h>
#define DEBUG_FLAG NAUTILUS_DEBUG_WINDOW
#include <libnautilus-private/nautilus-debug.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
