59ca1145 · 0b7a7f95 · 9b7df261 · 1134d868 · e7babd90 · fb8e0c4d
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
+variables:
+    GIT_SUBMODULE_STRATEGY: normal
+    BUNDLE: "nautilus-dev.flatpak"
+
+stages:
+    - image
+    - test
+    - cross environment
+    - deploy
+
+flatpak devel:
+    extends: '.flatpak'
+    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+    variables:
+        MANIFEST_PATH: "build-aux/flatpak/org.gnome.Nautilus.yml"
+        FLATPAK_MODULE: "nautilus"
+        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
+        APP_ID: "org.gnome.NautilusDevel"
+
+nightly:
+    extends: '.publish_nightly'
+    dependencies:
+        - 'flatpak devel'
+
+fedora latest:
+    image:
+        name: registry.gitlab.gnome.org/gnome/nautilus:latest
+        entrypoint: ["/bin/sh", "-c"]
+    stage: cross environment
+    script:
+        - meson _build .
+        - cd _build
+        - ninja test
+    only:
+        - web
+        - master
+    allow_failure: true
+
+flatpak master:
+    stage: cross environment
+    dependencies: []
+    variables:
+        MANIFEST_PATH: "build-aux/flatpak/org.gnome.NautilusMaster.yml"
+        FLATPAK_MODULE: "nautilus"
+        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
+        APP_ID: "org.gnome.NautilusDevel"
+    extends: .flatpak
+    only:
+        - schedules
+        - web
+        - tags
+    allow_failure: true
+
+style check:
+    image: registry.gitlab.gnome.org/gnome/nautilus:latest
+    stage: test
+    artifacts:
+        name: 'Style check artifacts'
+        expose_as: 'Get style check diff here'
+        when: on_failure
+        paths:
+            - 'uncrustify.diff'
+        expire_in: 14 days
+    script:
+        - gcc data/lineup-parameters.c `pkg-config --cflags --libs gio-2.0 gio-unix-2.0` -o data/lineup-parameters
+        - LANG=C.utf8 data/run-uncrustify.sh
+        - git diff --exit-code | tee uncrustify.diff
+
+update image:
+    variables:
+         STORAGE_DRIVER: vfs
+         BUILDAH_FORMAT: docker
+         BUILDAH_ISOLATION: chroot
+    image: registry.fedoraproject.org/fedora:33
+    stage: image
+    script:
+        - dnf install -y buildah runc
+        - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
+        - buildah bud --tag $CI_REGISTRY_IMAGE -f .gitlab/Dockerfile
+        - buildah tag $CI_REGISTRY_IMAGE "$CI_REGISTRY_IMAGE:v$CI_JOB_ID"
+        - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+        - buildah push $CI_REGISTRY_IMAGE
+        - buildah push "$CI_REGISTRY_IMAGE:v$CI_JOB_ID"
+    when: manual
+    only:
+        - web
+        - master
+    except:
+        variables:
+            - $CI_PROJECT_NAMESPACE != "GNOME"
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
+FROM fedora:latest
+
+RUN dnf install --nogpg -y dnf-plugins-core findutils git libportal-devel tracker3-miners python3-gobject dbus-daemon libhandy1-devel \
+ && dnf builddep --nogpg -y nautilus \
+ && dnf clean all
+
+RUN dnf install --nogpg -y gnome-common \
+ && dnf builddep --nogpg -y gnome-autoar \
+ && dnf clean all \
+ && git clone --depth 1 https://gitlab.gnome.org/GNOME/gnome-autoar.git \
+ && cd gnome-autoar \
+ && meson . _build --prefix=/usr \
+ && ninja -C _build \
+ && ninja -C _build install \
+ && cd .. \
+ && rm -rf gnome-autoar
+
+RUN dnf builddep --nogpg -y libhandy \
+ && dnf clean all \
+ && git clone --depth 1 https://gitlab.gnome.org/GNOME/libhandy.git \
+ && cd libhandy \
+ && meson . _build --prefix=/usr \
+ && ninja -C _build \
+ && ninja -C _build install \
+ && cd .. \
+ && rm -rf libhandy
+
+RUN dnf builddep --nogpg -y uncrustify \
+ && dnf clean all \
+ && git clone --depth 1 https://github.com/uncrustify/uncrustify.git \
+ && cd uncrustify \
+ && mkdir build \
+ && cd build \
+ && cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
+ && make \
+ && make install \
+ && cd ../.. \
+ && rm -rf uncrustify
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
+<!--
+    Please test if the issue has already been fixed in the Nightly version.
+
+    You can install the Nightly version in parallel with the regular version with these instructions:
+
+    1. Make sure that Flatpak is installed (see https://flatpak.org/setup )
+    2. Copy and run the following command in a Terminal:
+
+    flatpak install --from https://nightly.gnome.org/repo/appstream/org.gnome.NautilusDevel.flatpakref
+
+    3) The Nightly version can now be launched from Activities, or with this command: flatpak run org.gnome.NautilusDevel
+-->
+
+# Affected version
+- Nightly flatpak: Yes / No / Can't test it because <!-- Delete the unwanted anwsers -->
+- Other: <!-- Write the distribution you’re using and the version of the app. -->
+
+# Steps to reproduce
+<!--
+    Explain in detail the steps on how the issue can be reproduced.
+-->
+1.
+2.
+3.
+
+# Current behavior
+<!-- Describe the current behavior. -->
+
+
+# Expected behavior
+<!-- Describe the expected behavior. -->
+
+
+# Additional information
+<!--
+    Provide more information that could be relevant.
+    
+    If the issue is a crash, provide a stack trace following the steps in:
+    https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces
+-->
+
+
+<!-- Ignore the text under this line. -->
+/label ~"1. Bug"
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
+### Use cases
+<!-- Describe what problem(s) the user is experiencing and that this request
+is trying to solve. -->
+
+
+### Desired behavior
+<!-- Describe the desired functionality. -->
+
+
+### Benefits of the solution
+<!-- List the possible benefits of the solution and how it fits in the project. -->
+
+
+### Possible drawbacks
+<!--
+     Describe possible drawbacks of the feature and list how it could affect
+     the project i.e. UI discoverability, complexity, impact in more or less
+     number of users, etc.
+-->
+
+<!-- Ignore the text under this line. -->
+/label ~"1. Feature"
--- a/NEWS
+++ b/NEWS
-Major changes in 40.2
+Major changes in 41.0
 =====================
+* Translation updates
+
+Major changes in 41.rc
+=========================
+* Disable background "Properties" while searching (Felipe Borges)
+* Don't duplicate set wallpaper when not using portal (Barnabás Pőcze)
+* Translation updates (GNOME Translation Project contributors)
+
+Major changes in 41.beta
+=========================
+* Fix comma placement in the floating status bar (Nick Montalbano)
+* Use standard::edit-name attribute where appropriate (Anubhav Tyagi)
+* Bring "Open with..." options together in context menu (Luis Bosque)
+* Fix "Compress..." acting on file that was not the selected one (Anubhav Tyagi)
+* Redesign "Compress..." dialog (Ondrej Holy, Allan Day)
+* Provide creation of password-protected ZIP archives (Ondrej Holy)
+* Fix search by date not working with Tracker engine (Nishit Patel)
+* Add link to Privacy Settings from Trash (Eric Daigle)
+* Indicate whether trash automatic emptying is enabled (Eric Daigle)
+* Translation updates (GNOME Translation Project contributors)
+
+Major changes in 41.alpha
+=========================
+* Replace deprecated gexiv2 symbols (Ondrej Holy)
+* Make NautilusWindowSlot non-derivable (António Fernandes, Ernestas Kulik)
+* Prevent closing popover when "Show Hidden Files" is toggled (Rodrigo Pedro)
+* Hand preview updating over to FilesView (António Fernandes)
+* Provide source .svg icon (Jakub Steiner)
 * Fix missing "Open Scripts Folder" menu item (Ondrej Holy)
 * Prevent reopening of previewer on window focus (Felipe Borges)
 * Keep working directory when executing scripts (António Fernandes)

--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -34,9 +34,9 @@
      "buildsystem": "cmake-ninja",
      "sources": [
        {
-          "type": "archive",
-          "url": "https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz",
-          "sha256": "51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01"
+          "type": "git",
+          "url": "https://github.com/Exiv2/exiv2.git",
+          "branch": "0.27-maintenance"
        }
      ]
    },
@@ -46,13 +46,16 @@
      "builddir": true,
      "config-opts": [
        "--libdir=/app/lib",
-        "-Ddisable-introspection=True"
+        "-Dintrospection=false",
+        "-Dvapi=false",
+        "-Dpython3=false",
+        "-Dpython3_girdir=no"
      ],
      "sources": [
        {
          "type": "git",
          "url": "https://gitlab.gnome.org/GNOME/gexiv2.git",
-          "tag": "gexiv2-0.10.10"
+          "branch": "gexiv2-0.12"
        }
      ]
    },
@@ -100,6 +103,8 @@
    },
    {
      "name": "gnome-autoar",
+      "buildsystem": "meson",
+      "builddir": true,
      "sources": [
        {
          "type": "git",

--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -30,19 +30,22 @@ modules:
  - "-DCMAKE_INSTALL_LIBDIR=/app/lib"
  buildsystem: cmake-ninja
  sources:
-  - type: archive
-    url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz
-    sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01
+  - type: git
+    url: https://github.com/Exiv2/exiv2.git
+    branch: 0.27-maintenance
 - name: gexiv2
  buildsystem: meson
  builddir: true
  config-opts:
  - "--libdir=/app/lib"
-  - "-Ddisable-introspection=True"
+  - "-Dintrospection=false"
+  - "-Dvapi=false"
+  - "-Dpython3=false"
+  - "-Dpython3_girdir=no"
  sources:
  - type: git
    url: https://gitlab.gnome.org/GNOME/gexiv2.git
-    tag: gexiv2-0.10.10
+    tag: gexiv2-0.12
 - name: tracker-miners
  buildsystem: meson
  cleanup:
@@ -73,6 +76,8 @@ modules:
  - type: git
    url: https://gitlab.gnome.org/GNOME/gnome-desktop.git
 - name: gnome-autoar
+  buildsystem: meson
+  builddir: true
  sources:
  - type: git
    url: https://gitlab.gnome.org/GNOME/gnome-autoar.git

--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -30,18 +30,22 @@ modules:
  - "-DCMAKE_INSTALL_LIBDIR=/app/lib"
  buildsystem: cmake-ninja
  sources:
-  - type: archive
-    url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz
-    sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01
+  - type: git
+    url: https://github.com/Exiv2/exiv2.git
+    branch: 0.27-maintenance
 - name: gexiv2
  buildsystem: meson
  builddir: true
  config-opts:
  - "--libdir=/app/lib"
  - "-Dintrospection=false"
+  - "-Dvapi=false"
+  - "-Dpython3=false"
+  - "-Dpython3_girdir=no"
  sources:
  - type: git
    url: https://gitlab.gnome.org/GNOME/gexiv2.git
+    branch: gexiv2-0.12
 - name: tracker-miners
  buildsystem: meson
  cleanup:
@@ -72,6 +76,8 @@ modules:
  - type: git
    url: https://gitlab.gnome.org/GNOME/gnome-desktop.git
 - name: gnome-autoar
+  buildsystem: meson
+  builddir: true
  sources:
  - type: git
    url: https://gitlab.gnome.org/GNOME/gnome-autoar.git

--- a/data/org.gnome.Nautilus.Source.svg
+++ b/data/org.gnome.Nautilus.Source.svg
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -27,7 +27,7 @@
  <url type="translate">https://wiki.gnome.org/TranslationProject</url>
  <launchable type="desktop-id">@appid@.desktop</launchable>
  <releases>
-    <release version="40.2" date="2021-06-04" />
+    <release version="41.0" date="2021-09-17" />
  </releases>
  <project_group>GNOME</project_group>
  <project_license>GPL-2.0+</project_license>

--- a/data/org.gnome.nautilus.gschema.xml
+++ b/data/org.gnome.nautilus.gschema.xml
@@ -65,6 +65,7 @@
    <value value="0" nick="zip"/>
    <value value="1" nick="tar.xz"/>
    <value value="2" nick="7z"/>
+    <value value="3" nick="encrypted_zip"/>
  </enum>

  <schema path="/org/gnome/nautilus/" id="org.gnome.nautilus" gettext-domain="nautilus">
@@ -174,7 +175,7 @@
      </aliases>
      <default>'icon-view'</default>
      <summary>Default folder viewer</summary>
-      <description>When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are “list-view”, and “icon-view”.</description>
+      <description>When a folder is visited this viewer is used. Possible values are “list-view”, and “icon-view”.</description>
    </key>
    <key type="b" name="show-hidden-files">
      <default>false</default>

--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -2952,7 +2952,9 @@ eel_canvas_button (GtkWidget      *widget,
        break;

        default:
+        {
            mask = 0;
+        }
    }

    switch (event->type)
@@ -2988,7 +2990,9 @@ eel_canvas_button (GtkWidget      *widget,
        break;

        default:
+        {
            g_assert_not_reached ();
+        }
    }

    return retval;

--- a/extensions/image-properties/nautilus-image-properties-page.c
+++ b/extensions/image-properties/nautilus-image-properties-page.c
@@ -196,11 +196,11 @@ append_gexiv2_tag (NautilusImagesPropertiesPage  *page,
        {
            g_autofree char *tag_value = NULL;

-            tag_value = gexiv2_metadata_get_tag_interpreted_string (page->md, *i);
+            tag_value = gexiv2_metadata_try_get_tag_interpreted_string (page->md, *i, NULL);

            if (description == NULL)
            {
-                description = gexiv2_metadata_get_tag_description (*i);
+                description = gexiv2_metadata_try_get_tag_description (*i, NULL);
            }

            /* don't add empty tags - try next one */
@@ -262,7 +262,7 @@ append_gexiv2_info (NautilusImagesPropertiesPage *page)
    append_gexiv2_tag (page, rights, _("Copyright"));
    append_gexiv2_tag (page, rating, _("Rating"));

-    if (gexiv2_metadata_get_gps_info (page->md, &longitude, &latitude, &altitude))
+    if (gexiv2_metadata_try_get_gps_info (page->md, &longitude, &latitude, &altitude, NULL))
    {
        g_autofree char *gps_coords = NULL;


--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('nautilus', 'c',
  # Do not forget when releasing:
  #  * Update version in data/org.gnome.Nautilus.appdata.xml.in.in
  #  * Update GTK-based codes over src/gtk/gtk-code-generator.sh
-  version: '40.2',
+  version: '41.0',

  meson_version: '>= 0.49.0',
  license: 'GPL3+'
@@ -109,7 +109,7 @@ libgd_dep = libgd.get_variable('libgd_dep')
 libm = cc.find_library('m')

 if get_option('extensions')
-  gexiv = dependency('gexiv2', version: '>= 0.10.0')
+  gexiv = dependency('gexiv2', version: '>= 0.12.2')
  gst_tag_dep = dependency('gstreamer-tag-1.0')
  gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
 endif
@@ -117,7 +117,7 @@ gio = dependency('gio-2.0', version: glib_ver)
 gio_unix = dependency('gio-unix-2.0', version: glib_ver)
 glib = dependency('glib-2.0', version: glib_ver)
 gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
-gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.3.0')
+gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.4.0')
 gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
 gtk = dependency('gtk+-3.0', version: '>= 3.22.27')
 libhandy = dependency('libhandy-1', version: '>= 1.1.90')

--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po