Skip to content
Commits on Source (405)
Hide whitespace changes
Inline Side-by-side
NEWS
View file @ 8863c566
Major changes in 41.2
=====================
* Avoid cropping format popover in Compress dialog (António Fernandes)
Major changes in 42.beta
=========================
* Revert GTK 4 switch and intentional regressions (António Fernandes, Ondrej Holy)
* Fix criticals when selecting non-ZIP formats for compression (Ondrej Holy)
* Add shadows to thumbnails in the old views (António Fernandes)
* Support dark mode setting (Alexander Mikhaylenko)
* Translation updates (GNOME Translation Project contributors)
(Note: GTK 4 port is still in development but wasn't ready for this cycle.)
Major changes in 42.alpha
=========================
* Improve design of the file renaming UI (Peter Eisenmann, Allan Day)
* Improve visuals of the file conflict UI (Joshua Lee)
* Use GtkBuilder UI definitions for more components (António Fernandes, Apoorv Sachan)
* Fix "Move to"/"Copy to" from Starred (DillyPickly)
* Fix memory leak on tab switch (António Fernandes)
* Improve disposition of shell search provider (Marco Trevisan)
* Sort by subtype within type (rajat jain)
* Allow searching by creation time (Nishit Patel)
* Replace deprecated gexiv2 functions (Nishal Kulkarni)
* Fix extension API introspection annotations (Aaron Jacobs)
* Expand on extension API documentation (Aaron Jacobs)
* Add compressed archives to Recent files (Manny)
* Preparations for GTK 4 switch (Ernestas Kulik, António Fernandes, Matt Jakeman, Álvaro Costa, Suhaas Joshi)
* Complete the GtkFlowBox-based grid view (António Fernandes)
* Remove EelCanvas-based grid view (António Fernandes)
* Improve design of the path bar (António Fernandes)
* Fix geographical coordinates displayed format (Michael von Gunten)
* Port to GTK 4 (António Fernandes)
* Fix some GTK 4 switch regressions/warnings (António Fernandes, Ondrej Holy)
* Translation updates (GNOME Translation Project contributors)
Known major regressions in 42.alpha
- Lacks Drag-and-Drop interatcion
- Lacks clipboard interaction
- Lacks HiDPI icons
- Lacks MIME-type icons in list view
- Has poor performance for large directories in grid view
- Lacks attention-grabbing animation on operations button.
- Doesn't display emblems
- Doesn't display file filters as tags
- Lacks "Format" context menu item in sidebar
- Lacks Audio/Video properties page
Major changes in 41.1
=====================
* Cache Scripts and New Document menus to avoid lags (António Fernandes)
......
build-aux/flatpak/org.gnome.Nautilus.json
View file @ 8863c566
......@@ -10,6 +10,7 @@
"nightly"
],
"finish-args": [
"--device=dri",
"--share=ipc",
"--socket=x11",
"--socket=wayland",
......@@ -55,7 +56,7 @@
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/gexiv2.git",
"branch": "gexiv2-0.12"
"branch": "gexiv2-0.14"
}
]
},
......@@ -117,6 +118,8 @@
"buildsystem": "meson",
"builddir": true,
"config-opts": [
"-Ddocs=false",
"-Dbackends=gtk3",
"--libdir=/app/lib",
"--buildtype=debugoptimized"
],
......@@ -124,7 +127,7 @@
{
"type": "git",
"url": "https://github.com/flatpak/libportal.git",
"tag": "0.4"
"branch": "main"
}
]
},
......
build-aux/flatpak/org.gnome.Nautilus.yml
View file @ 8863c566
......@@ -9,6 +9,7 @@ tags:
- development
- nightly
finish-args:
- "--device=dri"
- "--share=ipc"
- "--socket=x11"
- "--socket=wayland"
......@@ -45,7 +46,7 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gexiv2.git
tag: gexiv2-0.12
tag: gexiv2-0.14
- name: tracker-miners
buildsystem: meson
cleanup:
......@@ -85,12 +86,14 @@ modules:
buildsystem: meson
builddir: true
config-opts:
- "-Ddocs=false"
- "-Dbackends=gtk3"
- "--libdir=/app/lib"
- "--buildtype=debugoptimized"
sources:
- type: git
url: https://github.com/flatpak/libportal.git
tag: 0.4
branch: main
- buildsystem: meson
builddir: true
name: nautilus
......
data/org.gnome.Nautilus.appdata.xml.in.in
View file @ 8863c566
......@@ -27,7 +27,7 @@
<url type="translate">https://wiki.gnome.org/TranslationProject</url>
<launchable type="desktop-id">@appid@.desktop</launchable>
<releases>
<release version="41.2" date="2022-01-12" />
<release version="42.beta" date="2022-02-12" />
</releases>
<project_group>GNOME</project_group>
<project_license>GPL-2.0+</project_license>
......
data/org.gnome.nautilus.gschema.xml
View file @ 8863c566
......@@ -59,6 +59,7 @@
<enum id="org.gnome.nautilus.SearchFilterTimeType">
<value value="0" nick="last_modified"/>
<value value="1" nick="last_used"/>
<value value="2" nick="created"/>
</enum>
<enum id="org.gnome.nautilus.CompressionFormat">
......
debian/changelog
View file @ 8863c566
nautilus (1:42~beta-1ubuntu1) UNRELEASED; urgency=medium
* Resynchronize with Debian, remaining Ubuntu changes:
- debian/control.in:
+ Build-Depend on libunity-dev
+ lower gnome-sushi Recommends to a Suggests
- debian/changelog, debian/rules: set epoch number (which was added by
error)
- debian/source_nautilus.py,
debian/nautilus-data.install:
+ Apport hook to list versions of files in /usr/lib/nautilus and
reassign the crashes when they are not due to nautilus code directly
- debian/rules:
+ Build Unity support
+ Bump dbgsym migration version
- 04_suppress_umount_in_ltsp.patch:
+ Don't list unmount and eject actions on LTSP clients
- 12_unity_launcher_support.patch:
+ unity launcher integration (list bookmarks in the context menu,
display a bar on the icon during copies)
- 18_unity_icon_color.patch:
+ specify a background color for the unity launcher icon
- 19_unity_open_location_xid.patch:
+ Add a new dbus property to store the lists of opened locations
referenced by their parent nautilus window XID.
- ubuntu_infobars_color.patch:
+ set infobar type to "other" rather than "question" to avoid blue
cluebars
- ubuntu_backspace_behaviour.patch:
+ restore backspace behaviour to go back
* debian/rules: Run dh_auto_test with NO_AT_BRIDGE=1
-- Jeremy Bicha <jeremy.bicha@canonical.com> Thu, 03 Feb 2022 14:51:57 -0500
nautilus (42~beta-1) unstable; urgency=medium
* New upstream release
* debian/control.in: Bump minimum libhandy and libgexiv2
* Add patch to revert a commit that introduced a build test failure.
Thanks to Seb Bacher for identifying the commit.
-- Jeremy Bicha <jeremy.bicha@canonical.com> Wed, 23 Feb 2022 07:48:55 -0500
nautilus (1:41.2-1ubuntu1) jammy; urgency=medium
* Resynchronize with Debian, remaining Ubuntu changes:
......
debian/control
View file @ 8863c566
......@@ -18,7 +18,7 @@ Build-Depends: appstream-util <!nocheck>,
libatk1.0-dev (>= 1.32.0),
libfontconfig1-dev,
libgail-3-dev,
libgexiv2-dev (>= 0.12.2),
libgexiv2-dev (>= 0.14.0),
libgirepository1.0-dev (>= 0.10.7-1~),
libglib2.0-dev (>= 2.67.1),
libglib2.0-doc,
......@@ -27,7 +27,7 @@ Build-Depends: appstream-util <!nocheck>,
libgstreamer-plugins-base1.0-dev,
libgtk-3-dev (>= 3.22.27),
libgtk-3-doc,
libhandy-1-dev (>= 1.1.90),
libhandy-1-dev (>= 1.5.0),
libpango1.0-dev (>= 1.42),
libselinux1-dev (>= 2.0) [linux-any],
libtracker-sparql-3.0-dev,
......
debian/control.in
View file @ 8863c566
......@@ -14,7 +14,7 @@ Build-Depends: appstream-util <!nocheck>,
libatk1.0-dev (>= 1.32.0),
libfontconfig1-dev,
libgail-3-dev,
libgexiv2-dev (>= 0.12.2),
libgexiv2-dev (>= 0.14.0),
libgirepository1.0-dev (>= 0.10.7-1~),
libglib2.0-dev (>= 2.67.1),
libglib2.0-doc,
......@@ -23,7 +23,7 @@ Build-Depends: appstream-util <!nocheck>,
libgstreamer-plugins-base1.0-dev,
libgtk-3-dev (>= 3.22.27),
libgtk-3-doc,
libhandy-1-dev (>= 1.1.90),
libhandy-1-dev (>= 1.5.0),
libpango1.0-dev (>= 1.42),
libselinux1-dev (>= 2.0) [linux-any],
libtracker-sparql-3.0-dev,
......
debian/nautilus.maintscript
View file @ 8863c566
rm_conffile /etc/xdg/autostart/nautilus-autostart.desktop 1:3.36.1.1-1ubuntu3~
rm_conffile /etc/xdg/autostart/nautilus-autostart.desktop 1:42~beta-1ubuntu1~
debian/patches/04_suppress_umount_in_ltsp.patch
View file @ 8863c566
......@@ -10,7 +10,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/220564
1 file changed, 10 insertions(+)
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index c14356d..c376471 100644
index f210288..b8b85aa 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -1132,6 +1132,11 @@ nautilus_file_can_unmount (NautilusFile *file)
......
debian/patches/12_unity_launcher_support.patch
View file @ 8863c566
......@@ -19,10 +19,10 @@ Subject: _unity_launcher_support
create mode 100644 src/unity-quicklist-handler.h
diff --git a/meson.build b/meson.build
index d5c8f05..33332e3 100644
index 06466a0..5a258b7 100644
--- a/meson.build
+++ b/meson.build
@@ -132,6 +132,11 @@ endif
@@ -134,6 +134,11 @@ endif
tracker_sparql = dependency('tracker-sparql-3.0')
xml = dependency('libxml-2.0', version: '>= 2.7.8')
......@@ -34,7 +34,7 @@ index d5c8f05..33332e3 100644
####################
# End dependencies #
####################
@@ -173,6 +178,8 @@ conf.set('ENABLE_PROFILING', get_option('profiling'))
@@ -175,6 +180,8 @@ conf.set('ENABLE_PROFILING', get_option('profiling'))
conf.set('HAVE_LIBPORTAL', get_option('libportal'))
conf.set('HAVE_SELINUX', get_option('selinux'))
......@@ -59,7 +59,7 @@ index 6e781c4..48badc1 100644
# End features #
################
diff --git a/src/meson.build b/src/meson.build
index 39e0b03..93894b3 100644
index 11e7a04..b3fa861 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -289,6 +289,16 @@ nautilus_deps = [
......@@ -80,7 +80,7 @@ index 39e0b03..93894b3 100644
'nautilus',
libnautilus_sources,
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 973e1b5..5dc81b3 100644
index 3f3cc89..a930193 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -24,6 +24,7 @@
......@@ -102,7 +102,7 @@ index 973e1b5..5dc81b3 100644
typedef struct
{
NautilusProgressPersistenceHandler *progress_handler;
@@ -1326,6 +1331,10 @@ nautilus_application_startup (GApplication *app)
@@ -1329,6 +1334,10 @@ nautilus_application_startup (GApplication *app)
nautilus_application_startup_common (self);
nautilus_profile_end (NULL);
......@@ -114,7 +114,7 @@ index 973e1b5..5dc81b3 100644
static gboolean
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index dc5574a..adca37b 100644
index 5fe4e63..226d8ba 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -25,6 +25,12 @@
......@@ -130,7 +130,7 @@ index dc5574a..adca37b 100644
#include "animation/ide-box-theatric.h"
#include "animation/egg-animation.h"
@@ -117,6 +123,9 @@ struct _NautilusToolbar
@@ -114,6 +120,9 @@ struct _NautilusToolbar
GBinding *icon_binding;
GBinding *search_binding;
GBinding *tooltip_binding;
......@@ -140,7 +140,7 @@ index dc5574a..adca37b 100644
};
enum
@@ -371,6 +380,9 @@ on_remove_finished_operations_timeout (NautilusToolbar *self)
@@ -324,6 +333,9 @@ on_remove_finished_operations_timeout (NautilusToolbar *self)
{
gtk_revealer_set_reveal_child (GTK_REVEALER (self->operations_revealer),
FALSE);
......@@ -150,7 +150,7 @@ index dc5574a..adca37b 100644
}
else
{
@@ -557,6 +569,10 @@ update_operations (NautilusToolbar *self)
@@ -503,6 +515,10 @@ update_operations (NautilusToolbar *self)
TRUE);
gtk_widget_queue_draw (self->operations_icon);
......@@ -161,7 +161,7 @@ index dc5574a..adca37b 100644
/* Show the popover at start to increase visibility.
* Check whether the toolbar is visible or not before showing the
* popover. This can happens if the window has the disables-chrome
@@ -724,6 +740,10 @@ on_operations_icon_draw (GtkWidget *widget,
@@ -670,6 +686,10 @@ on_operations_icon_draw (GtkWidget *widget,
}
......@@ -172,7 +172,7 @@ index dc5574a..adca37b 100644
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_height (widget);
@@ -926,6 +946,9 @@ nautilus_toolbar_constructed (GObject *object)
@@ -866,6 +886,9 @@ nautilus_toolbar_constructed (GObject *object)
G_CALLBACK (on_location_entry_close), self);
self->progress_manager = nautilus_progress_info_manager_dup_singleton ();
......
debian/patches/Revert-meson.build-Use-environment-to-make-warnings-fatal.patch 0 → 100644
View file @ 8863c566
From: Jeremy Bicha <jbicha@debian.org>
Date: Wed, 23 Feb 2022 07:36:28 -0500
Subject: Revert "meson.build: Use environment to make warnings fatal"
This reverts commit 6ff47626282dfbeb74129912a9f658a293ba7825.
This made one of the build tests fail for us. Needs more investigation.
---
src/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/meson.build b/src/meson.build
index cfd56ee..11e7a04 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -324,9 +324,9 @@ if get_option('tests') == 'all'
'nautilus', nautilus,
args: [
'--check',
+ '--g-fatal-warnings'
],
env: [
- 'G_DEBUG=fatal-warnings',
'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.build_root(), 'data'))
]
)
debian/patches/appstream-compulsory.patch
View file @ 8863c566
......@@ -9,7 +9,7 @@ and gnome-software does not warn about uninstalling dependent packages
1 file changed, 2 insertions(+)
diff --git a/data/org.gnome.Nautilus.appdata.xml.in.in b/data/org.gnome.Nautilus.appdata.xml.in.in
index b0a58b2..d65f5b4 100644
index c0c4d57..24014d2 100644
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -58,5 +58,7 @@
......
debian/patches/series
View file @ 8863c566
multiarch_fallback.patch
Revert-meson.build-Use-environment-to-make-warnings-fatal.patch
04_suppress_umount_in_ltsp.patch
12_unity_launcher_support.patch
18_unity_icon_color.patch
......
debian/patches/ubuntu_backspace_behaviour.patch
View file @ 8863c566
From: =?utf-8?q?Sebastien_No=C3=ABl?= <sebastien@twolife.be>
Date: Tue, 28 Jan 2014 19:08:31 +0000
From: Jeremy Bicha <jbicha@debian.org>
Date: Wed, 23 Feb 2022 08:06:34 -0500
Subject: Restore backspace for going to parent folder
This restores the behaviour from nautilus <= 3.4.
......@@ -8,21 +8,21 @@ This restores the behaviour from nautilus <= 3.4.
1 file changed, 2 insertions(+)
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 54566b9..81f9268 100644
index f92858b..46217e3 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2007,6 +2007,7 @@ const GActionEntry win_entries[] =
{
{ "back", action_back },
@@ -2041,6 +2041,7 @@ const GActionEntry win_entries[] =
{ "forward", action_forward },
{ "back-n", action_back_n, "u" },
{ "forward-n", action_forward_n, "u" },
+ { "backspaceup", action_up },
{ "up", action_up },
{ "view-menu", action_toggle_state_view_button, NULL, "false", NULL },
{ "reload", action_reload },
@@ -2088,6 +2089,7 @@ nautilus_window_initialize_actions (NautilusWindow *window)
{ "current-location-menu", action_show_current_location_menu },
@@ -2110,6 +2111,7 @@ nautilus_window_initialize_actions (NautilusWindow *window)
/* Support keyboard layouts which have a dead tilde key but not a tilde key. */
nautilus_application_set_accelerators (app, "win.prompt-home-location", prompt_home_location_accels);
nautilus_application_set_accelerator (app, "win.view-menu", "F10");
nautilus_application_set_accelerators (app, "win.prompt-home-location", ACCELS ("asciitilde", "dead_tilde"));
nautilus_application_set_accelerator (app, "win.current-location-menu", "F10");
+ nautilus_application_set_accelerator (app, "win.backspaceup", "BackSpace");
nautilus_application_set_accelerator (app, "win.restore-tab", "<shift><control>t");
......
debian/patches/ubuntu_infobars_color.patch
View file @ 8863c566
......@@ -11,10 +11,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/1259059
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/nautilus-special-location-bar.c b/src/nautilus-special-location-bar.c
index 2c2ce07..821caaf 100644
index ce40521..704df2b 100644
--- a/src/nautilus-special-location-bar.c
+++ b/src/nautilus-special-location-bar.c
@@ -190,7 +190,7 @@ GtkWidget *
@@ -189,7 +189,7 @@ GtkWidget *
nautilus_special_location_bar_new (NautilusSpecialLocation location)
{
return g_object_new (NAUTILUS_TYPE_SPECIAL_LOCATION_BAR,
......@@ -24,7 +24,7 @@ index 2c2ce07..821caaf 100644
NULL);
}
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index 7fca03e..eca1846 100644
index 4f19bdf..9300dba 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -281,6 +281,6 @@ nautilus_trash_bar_new (NautilusFilesView *view)
......@@ -36,10 +36,10 @@ index 7fca03e..eca1846 100644
NULL);
}
diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c
index f37c846..2c41e97 100644
index 2613cff..1dd4166 100644
--- a/src/nautilus-x-content-bar.c
+++ b/src/nautilus-x-content-bar.c
@@ -345,7 +345,7 @@ nautilus_x_content_bar_new (GMount *mount,
@@ -349,7 +349,7 @@ nautilus_x_content_bar_new (GMount *mount,
const char * const *x_content_types)
{
return g_object_new (NAUTILUS_TYPE_X_CONTENT_BAR,
......
debian/rules
View file @ 8863c566
......@@ -30,4 +30,3 @@ override_dh_install:
dh_install
mkdir -p debian/nautilus/usr/share/apport/package-hooks
sed 's/DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/g' debian/source_nautilus.py.in > debian/nautilus/usr/share/apport/package-hooks/source_nautilus.py
eel/check-eel
View file @ 8863c566
#!/bin/sh
./check-program --g-fatal-warnings --sm-disable
G_DEBUG=fatal-warnings ./check-program --sm-disable
eel/eel-stock-dialogs.c
View file @ 8863c566
......@@ -203,7 +203,7 @@ timed_wait_callback (gpointer callback_data)
/* Put up the timed wait window. */
button = wait->cancel_callback != NULL ? _("_Cancel") : ("_OK");
dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window,
0,
GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO,
GTK_BUTTONS_NONE,
NULL));
......@@ -318,19 +318,17 @@ eel_timed_wait_stop (EelCancelCallback cancel_callback,
timed_wait_free (wait);
}
int
eel_run_simple_dialog (GtkWidget *parent,
gboolean ignore_close_box,
GtkMessageType message_type,
const char *primary_text,
const char *secondary_text,
...)
GtkDialog *
eel_show_simple_dialog (GtkWidget *parent,
GtkMessageType message_type,
const char *primary_text,
const char *secondary_text,
...)
{
va_list button_title_args;
const char *button_title;
GtkWidget *dialog;
GtkWidget *top_widget, *chosen_parent;
int result;
int response_id;
/* Parent it if asked to. */
......@@ -346,7 +344,7 @@ eel_run_simple_dialog (GtkWidget *parent,
/* Create the dialog. */
dialog = gtk_message_dialog_new (GTK_WINDOW (chosen_parent),
0,
GTK_DIALOG_MODAL,
message_type,
GTK_BUTTONS_NONE,
NULL);
......@@ -371,17 +369,9 @@ eel_run_simple_dialog (GtkWidget *parent,
}
va_end (button_title_args);
/* Run it. */
gtk_widget_show (dialog);
result = gtk_dialog_run (GTK_DIALOG (dialog));
while ((result == GTK_RESPONSE_NONE || result == GTK_RESPONSE_DELETE_EVENT) && ignore_close_box)
{
gtk_widget_show (GTK_WIDGET (dialog));
result = gtk_dialog_run (GTK_DIALOG (dialog));
}
gtk_widget_destroy (dialog);
gtk_widget_show_all (dialog);
return result;
return GTK_DIALOG (dialog);
}
static GtkDialog *
......@@ -394,7 +384,7 @@ create_message_dialog (const char *primary_text,
GtkWidget *dialog;
dialog = gtk_message_dialog_new (parent,
0,
GTK_DIALOG_MODAL,
type,
buttons_type,
NULL);
......
eel/eel-stock-dialogs.h
View file @ 8863c566
......@@ -40,8 +40,7 @@ void eel_timed_wait_stop (EelCancelCallback cancel_callbac
gpointer callback_data);
/* Basic dialog with buttons. */
int eel_run_simple_dialog (GtkWidget *parent,
gboolean ignore_close_box,
GtkDialog *eel_show_simple_dialog (GtkWidget *parent,
GtkMessageType message_type,
const char *primary_text,
const char *secondary_text,
......@@ -72,4 +71,4 @@ GtkDialog *eel_create_question_dialog (const char *primary_text,
int response_one,
const char *answer_two,
int response_two,
GtkWindow *parent);
\ No newline at end of file
GtkWindow *parent);