[nautilus: 12/12] Merge branch 'wip/ernestask/long-live-the-desktop' into 'master'



commit 6584c17896d4206a45313d49ca136c67de008b56
Merge: f3f2cd1de d48db627f
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Tue Jan 2 17:41:00 2018 +0000

    Merge branch 'wip/ernestask/long-live-the-desktop' into 'master'
    
    remove the desktop
    
    Closes #158
    
    See merge request GNOME/nautilus!46

 .gitlab-ci.yml                                     |    6 +-
 build-aux/flatpak/org.gnome.Nautilus.json          |    1 -
 config.h.meson                                     |   10 -
 data/.gitignore                                    |    2 -
 data/icons/meson.build                             |    2 -
 data/meson.build                                   |  158 +-
 data/nautilus-autostart.desktop.in                 |    7 -
 data/nautilus-classic.desktop.in                   |   11 -
 data/org.gnome.nautilus.gschema.xml                |   56 +-
 data/run-uncrustify.sh                             |    2 +-
 docs/meson.build                                   |    4 +-
 docs/nautilus.1                                    |    7 +-
 docs/reference/libnautilus-extension/meson.build   |   32 +-
 docs/reference/meson.build                         |    2 +-
 eel/eel-accessibility.c                            |    2 +-
 eel/eel-accessibility.h                            |    2 -
 eel/eel-art-extensions.c                           |   41 +-
 eel/eel-art-extensions.h                           |    9 -
 eel/eel-canvas.c                                   |  284 +-
 eel/eel-canvas.h                                   |   41 -
 eel/eel-glib-extensions.c                          |   46 -
 eel/eel-glib-extensions.h                          |    9 -
 eel/eel-gnome-extensions.c                         |   63 -
 eel/eel-gnome-extensions.h                         |   34 -
 eel/eel-gtk-extensions.c                           |    1 -
 eel/eel-vfs-extensions.c                           |   48 -
 eel/eel-vfs-extensions.h                           |    4 -
 eel/eel.h                                          |    1 -
 eel/meson.build                                    |   94 +-
 libnautilus-extension/meson.build                  |  124 +-
 meson.build                                        |  200 +-
 meson_options.txt                                  |   23 +-
 nautilus-desktop/.gitignore                        |    1 -
 nautilus-desktop/main-desktop.c                    |   49 -
 nautilus-desktop/meson.build                       |   30 -
 nautilus-desktop/nautilus-desktop-application.c    |  280 --
 nautilus-desktop/nautilus-desktop-application.h    |   36 -
 .../nautilus-desktop-canvas-view-container.c       |  215 --
 .../nautilus-desktop-canvas-view-container.h       |   35 -
 nautilus-desktop/nautilus-desktop-canvas-view.c    |  794 ------
 nautilus-desktop/nautilus-desktop-canvas-view.h    |   54 -
 nautilus-desktop/nautilus-desktop-directory-file.c |  568 ----
 nautilus-desktop/nautilus-desktop-directory-file.h |   53 -
 nautilus-desktop/nautilus-desktop-directory.c      |  588 ----
 nautilus-desktop/nautilus-desktop-directory.h      |   58 -
 nautilus-desktop/nautilus-desktop-icon-file.c      |  550 ----
 nautilus-desktop/nautilus-desktop-icon-file.h      |   60 -
 nautilus-desktop/nautilus-desktop-link-monitor.c   |  460 ----
 nautilus-desktop/nautilus-desktop-link-monitor.h   |   60 -
 nautilus-desktop/nautilus-desktop-link.c           |  482 ----
 nautilus-desktop/nautilus-desktop-link.h           |   77 -
 nautilus-desktop/nautilus-desktop-metadata.c       |   90 -
 nautilus-desktop/nautilus-desktop-metadata.h       |   43 -
 nautilus-desktop/nautilus-desktop-window-slot.c    |   69 -
 nautilus-desktop/nautilus-desktop-window-slot.h    |   36 -
 nautilus-desktop/nautilus-desktop-window.c         |  533 ----
 nautilus-desktop/nautilus-desktop-window.h         |   59 -
 nautilus-sendto-extension/meson.build              |   18 +-
 po/POTFILES.in                                     |    5 -
 po/meson.build                                     |    2 +-
 src/meson.build                                    |  619 ++---
 src/nautilus-application.c                         |    4 +-
 src/nautilus-autorun-software.c                    |    1 -
 src/nautilus-bookmark.c                            |    3 +-
 src/nautilus-canvas-container.c                    | 2806 ++------------------
 src/nautilus-canvas-container.h                    |   34 +-
 src/nautilus-canvas-dnd.c                          |  252 +-
 src/nautilus-canvas-private.h                      |   46 -
 src/nautilus-canvas-view.c                         |  686 +----
 src/nautilus-canvas-view.h                         |   11 +-
 src/nautilus-dbus-manager.c                        |    4 +-
 src/nautilus-directory-async.c                     |   35 +-
 src/nautilus-directory-notify.h                    |    8 -
 src/nautilus-directory.c                           |   64 -
 src/nautilus-dnd.c                                 |   83 -
 src/nautilus-dnd.h                                 |    4 -
 src/nautilus-file-changes-queue.c                  |   95 +-
 src/nautilus-file-changes-queue.h                  |    4 -
 src/nautilus-file-operations.c                     |  250 +-
 src/nautilus-file-operations.h                     |    8 -
 src/nautilus-file-private.h                        |    1 -
 src/nautilus-file-undo-operations.c                |   11 +-
 src/nautilus-file-utilities.c                      |   58 +-
 src/nautilus-file-utilities.h                      |    2 -
 src/nautilus-file.c                                |  115 +-
 src/nautilus-file.h                                |    5 +-
 src/nautilus-files-view-dnd.c                      |  105 +-
 src/nautilus-files-view-dnd.h                      |   16 +-
 src/nautilus-files-view.c                          |  179 +-
 src/nautilus-files-view.h                          |   17 +-
 src/nautilus-global-preferences.c                  |    2 -
 src/nautilus-global-preferences.h                  |   14 -
 src/nautilus-icon-info.c                           |    2 -
 src/nautilus-icon-names.h                          |   19 -
 src/nautilus-lib-self-check-functions.h            |    1 -
 src/nautilus-link.c                                |  109 +-
 src/nautilus-link.h                                |    7 +-
 src/nautilus-list-view.c                           |   31 +-
 src/nautilus-metadata.c                            |   20 -
 src/nautilus-metadata.h                            |   24 -
 src/nautilus-program-choosing.c                    |   34 +-
 src/nautilus-properties-window.c                   |    5 -
 src/nautilus-recent.c                              |    3 +-
 src/nautilus-tree-view-drag-dest.c                 |   46 +-
 src/nautilus-view-icon-controller.c                |    7 -
 src/nautilus-view.h                                |    1 -
 src/nautilus-window-slot-dnd.c                     |    3 +-
 src/nautilus-window-slot.c                         |    3 +-
 src/nautilus-window.c                              |   86 +-
 src/resources/css/Adwaita.css                      |   23 -
 src/resources/css/nautilus.css                     |    7 -
 .../ui/nautilus-files-view-context-menus.ui        |   36 -
 test/meson.build                                   |   49 +-
 test/test-copy.c                                   |    1 -
 114 files changed, 1153 insertions(+), 11537 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]