[nautilus: 3/3] Merge branch 'wip/carlosg/favorites' into 'master'
- From: Gitlab Administrative User <gitlab src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus: 3/3] Merge branch 'wip/carlosg/favorites' into 'master'
- Date: Sun, 5 Nov 2017 20:33:46 +0000 (UTC)
commit 6af42427f8331eac23bb413d1ec06c9e4c61409a
Merge: 0be00303f 86e5d2b53
Author: Carlos Soriano <csoriano1618 gmail com>
Date: Sun Nov 5 20:33:15 2017 +0000
Merge branch 'wip/carlosg/favorites' into 'master'
Add starred files
See https://gitlab.gnome.org/GNOME/nautilus/merge_requests/21
data/org.gnome.nautilus.gschema.xml | 4 +-
eel/eel-vfs-extensions.c | 6 +
eel/eel-vfs-extensions.h | 1 +
src/meson.build | 6 +-
src/nautilus-application.c | 14 +
src/nautilus-bookmark-list.c | 5 +
src/nautilus-column-utilities.c | 11 +
src/nautilus-directory.c | 14 +
src/nautilus-directory.h | 1 +
src/nautilus-favorite-directory.c | 585 ++++++++++++++
src/nautilus-favorite-directory.h | 57 ++
src/nautilus-file-undo-operations.c | 221 ++++++
src/nautilus-file-undo-operations.h | 26 +
src/nautilus-file-utilities.c | 18 +-
src/nautilus-file-utilities.h | 1 +
src/nautilus-file.c | 103 ++-
src/nautilus-file.h | 3 +
src/nautilus-files-view.c | 161 +++-
src/nautilus-list-view-private.h | 4 +
src/nautilus-list-view.c | 211 ++++-
src/nautilus-pathbar.c | 12 +-
src/nautilus-query.c | 19 +
src/nautilus-query.h | 4 +
src/nautilus-search-engine-model.c | 17 +
src/nautilus-search-engine-simple.c | 19 +-
src/nautilus-search-engine-tracker.c | 5 +
src/nautilus-search-engine.c | 6 +-
src/nautilus-tag-manager.c | 884 +++++++++++++++++++++
src/nautilus-tag-manager.h | 57 ++
src/nautilus-window.c | 14 +
src/resources/nautilus.gresource.xml | 1 +
.../ui/nautilus-files-view-context-menus.ui | 17 +
src/resources/ui/nautilus-starred-is-empty.ui | 42 +
src/resources/ui/nautilus-window.ui | 2 +
34 files changed, 2516 insertions(+), 35 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]