Skip to content
Commits on Source (50)
Major changes in 42.rc
=========================
* Tweak thumbnail shadow drawing to fix performance regressions (António Fernandes)
* Various search engine fixes (Ondrej Holy)
* Translation updates (GNOME Translation Project contributors)
Major changes in 42.beta
=========================
* Revert GTK 4 switch and intentional regressions (António Fernandes, Ondrej Holy)
......
......@@ -27,7 +27,7 @@
<url type="translate">https://wiki.gnome.org/TranslationProject</url>
<launchable type="desktop-id">@appid@.desktop</launchable>
<releases>
<release version="42.beta" date="2022-02-12" />
<release version="42.rc" date="2022-03-05" />
</releases>
<project_group>GNOME</project_group>
<project_license>GPL-2.0+</project_license>
......
nautilus (1:42~beta-1ubuntu1) UNRELEASED; urgency=medium
nautilus (1:42~rc-1ubuntu1) jammy; urgency=medium
* Resynchronize with Debian, remaining Ubuntu changes:
- debian/control.in:
......@@ -12,7 +12,6 @@ nautilus (1:42~beta-1ubuntu1) UNRELEASED; urgency=medium
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:
......@@ -28,9 +27,55 @@ nautilus (1:42~beta-1ubuntu1) UNRELEASED; urgency=medium
cluebars
- ubuntu_backspace_behaviour.patch:
+ restore backspace behaviour to go back
* debian/rules: Run dh_auto_test with NO_AT_BRIDGE=1
- Bump version for maintscript since there was a 20.04 LTS SRU with
higher version
-- Jeremy Bicha <jeremy.bicha@canonical.com> Thu, 03 Feb 2022 14:51:57 -0500
-- Jeremy Bicha <jeremy.bicha@canonical.com> Wed, 09 Mar 2022 13:44:06 -0500
nautilus (42~rc-1) unstable; urgency=medium
* New upstream release
-- Jeremy Bicha <jeremy.bicha@canonical.com> Wed, 09 Mar 2022 13:39:12 -0500
nautilus (1:42~beta-1ubuntu1) jammy; urgency=medium
[ Jeremy Bicha ]
* 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
- 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
* Bump version for maintscript since there was a 20.04 LTS SRU with
higher version
* Refresh patches
[ Marco Trevisan (Treviño) ]
* debian/patches: Refresh XUbuntuCancel support patch
-- Jeremy Bicha <jeremy.bicha@canonical.com> Wed, 23 Feb 2022 21:38:32 -0500
nautilus (42~beta-1) unstable; urgency=medium
......
......@@ -18,9 +18,9 @@ Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/nautilus/+bug/1756826
Forwarded: not-needed
---
data/shell-search-provider-dbus-interfaces.xml | 1 +
src/nautilus-shell-search-provider.c | 103 +++++++++++++++++++++++--
2 files changed, 97 insertions(+), 7 deletions(-)
data/shell-search-provider-dbus-interfaces.xml | 1 +
src/nautilus-shell-search-provider.c | 58 +++++++++++++++++++++++---
2 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/data/shell-search-provider-dbus-interfaces.xml b/data/shell-search-provider-dbus-interfaces.xml
index f6840e2..4529c1e 100644
......@@ -34,100 +34,22 @@ index f6840e2..4529c1e 100644
</interface>
</node>
diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
index c0da929..cfbab5a 100644
index 657736d..206bd5d 100644
--- a/src/nautilus-shell-search-provider.c
+++ b/src/nautilus-shell-search-provider.c
@@ -60,6 +60,7 @@ struct _NautilusShellSearchProvider
PendingSearch *current_search;
+ GList *metas_requests;
GHashTable *metas_cache;
};
@@ -143,11 +144,25 @@ pending_search_finish (PendingSearch *search,
@@ -593,13 +593,35 @@ result_metas_return_empty (ResultMetasData *data)
}
static void
-cancel_current_search (NautilusShellSearchProvider *self)
+cancel_current_search (NautilusShellSearchProvider *self,
+ gboolean ignore_partial_results)
{
- if (self->current_search != NULL)
+ PendingSearch *search = self->current_search;
+
+ if (search != NULL)
{
- nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (self->current_search->engine));
+ g_debug ("*** Cancel current search");
+
+ nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (search->engine));
+
+ if (ignore_partial_results)
+ {
+ g_signal_handlers_disconnect_by_data (G_OBJECT (search->engine),
+ search);
+
+ pending_search_finish (search, search->invocation,
+ g_variant_new ("(as)", NULL));
+ }
}
}
@@ -451,7 +466,7 @@ execute_search (NautilusShellSearchProvider *self,
NautilusQuery *query;
PendingSearch *pending_search;
- cancel_current_search (self);
+ cancel_current_search (self, FALSE);
/* don't attempt searches for a single character */
if (g_strv_length (terms) == 1 &&
@@ -524,6 +539,7 @@ typedef struct
NautilusShellSearchProvider *self;
gint64 start_time;
+ NautilusFileListHandle *handle;
GDBusMethodInvocation *invocation;
gchar **uris;
@@ -532,6 +548,7 @@ typedef struct
static void
result_metas_data_free (ResultMetasData *data)
{
+ g_clear_pointer (&data->handle, nautilus_file_list_cancel_call_when_ready);
g_clear_object (&data->self);
g_clear_object (&data->invocation);
g_strfreev (data->uris);
@@ -549,7 +566,7 @@ result_metas_return_from_cache (ResultMetasData *data)
g_variant_builder_init (&builder, G_VARIANT_TYPE ("aa{sv}"));
- for (idx = 0; data->uris[idx] != NULL; idx++)
+ for (idx = 0; data->uris && data->uris[idx] != NULL; idx++)
{
meta = g_hash_table_lookup (data->self->metas_cache,
data->uris[idx]);
@@ -564,6 +581,47 @@ result_metas_return_from_cache (ResultMetasData *data)
g_variant_new ("(aa{sv})", &builder));
}
+static void
+result_metas_return_empty (ResultMetasData *data)
+{
+ g_clear_pointer (&data->uris, g_strfreev);
+ result_metas_return_from_cache (data);
+ result_metas_data_free (data);
+}
+
+static void
-cancel_result_meta_requests (NautilusShellSearchProvider *self)
+cancel_result_meta_requests (NautilusShellSearchProvider *self,
+ GDBusMethodInvocation *invocation)
+{
+ ResultMetasData *data;
+
+ g_debug ("*** Cancel Results Meta requests");
+
{
g_debug ("*** Cancel Results Meta requests");
- g_list_free_full (self->metas_requests,
- (GDestroyNotify) result_metas_return_empty);
- self->metas_requests = NULL;
+ if (invocation == NULL)
+ {
+ g_list_free_full (self->metas_requests,
......@@ -140,8 +62,9 @@ index c0da929..cfbab5a 100644
+
+ for (l = self->metas_requests; l != NULL; l = next)
+ {
+ ResultMetasData *data = l->data;
+
+ next = l->next;
+ data = l->data;
+
+ if (g_strcmp0 (g_dbus_method_invocation_get_sender (data->invocation),
+ g_dbus_method_invocation_get_sender (invocation)) == 0)
......@@ -151,34 +74,10 @@ index c0da929..cfbab5a 100644
+ }
+ }
+ }
+}
+
static void
result_list_attributes_ready_cb (GList *file_list,
gpointer user_data)
@@ -639,6 +697,9 @@ result_list_attributes_ready_cb (GList *file_list,
g_free (uri);
}
+ data->handle = NULL;
+ data->self->metas_requests = g_list_remove (data->self->metas_requests, data);
+
result_metas_return_from_cache (data);
result_metas_data_free (data);
}
@@ -682,9 +743,10 @@ handle_get_result_metas (NautilusShellSearchProvider2 *skeleton,
nautilus_file_list_call_when_ready (missing_files,
NAUTILUS_FILE_ATTRIBUTES_FOR_ICON,
- NULL,
+ &data->handle,
result_list_attributes_ready_cb,
data);
+ self->metas_requests = g_list_prepend (self->metas_requests, data);
nautilus_file_list_free (missing_files);
return TRUE;
}
@@ -747,6 +809,30 @@ handle_launch_search (NautilusShellSearchProvider2 *skeleton,
static void
@@ -812,6 +834,30 @@ handle_launch_search (NautilusShellSearchProvider2 *skeleton,
return TRUE;
}
......@@ -196,7 +95,7 @@ index c0da929..cfbab5a 100644
+ g_strcmp0 (g_dbus_method_invocation_get_sender (search->invocation),
+ g_dbus_method_invocation_get_sender (invocation)) == 0)
+ {
+ cancel_current_search (self, TRUE);
+ cancel_current_search_ignoring_partial_results (self);
+ }
+
+ cancel_result_meta_requests (self, invocation);
......@@ -209,17 +108,16 @@ index c0da929..cfbab5a 100644
static void
search_provider_dispose (GObject *obj)
{
@@ -754,7 +840,8 @@ search_provider_dispose (GObject *obj)
@@ -820,7 +866,7 @@ search_provider_dispose (GObject *obj)
g_clear_object (&self->skeleton);
g_hash_table_destroy (self->metas_cache);
- cancel_current_search (self);
+ cancel_current_search (self, TRUE);
cancel_current_search_ignoring_partial_results (self);
- cancel_result_meta_requests (self);
+ cancel_result_meta_requests (self, NULL);
G_OBJECT_CLASS (nautilus_shell_search_provider_parent_class)->dispose (obj);
}
@@ -777,6 +864,8 @@ nautilus_shell_search_provider_init (NautilusShellSearchProvider *self)
@@ -843,6 +889,8 @@ nautilus_shell_search_provider_init (NautilusShellSearchProvider *self)
G_CALLBACK (handle_activate_result), self);
g_signal_connect (self->skeleton, "handle-launch-search",
G_CALLBACK (handle_launch_search), self);
......
......@@ -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: '42.beta',
version: '42.rc',
meson_version: '>= 0.49.0',
license: 'GPL3+'
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# nautilus ja.po.
# Copyright (C) 2000-2021 Free Software Foundation, Inc.
# Copyright (C) 2000-2022 Free Software Foundation, Inc.
# Akira TAGOH <tagoh@gnome.gr.jp>, 2000-2002.
# Takuo Kitame <kitame@debian.org>, 2001.
# Yukihiro Nakai <nakai@gnome.gr.jp>, 2001.
......@@ -14,7 +14,7 @@
# Hajime Taira <htaira@redhat.com>, 2015, 2019.
# Akira Tanaka <root.167d36d4acb91@gmail.com>, 2017.
# sujiniku <sujinikusityuu@gmail.com>, 2018, 2021.
# sicklylife <translation@sicklylife.jp>, 2019-2021.
# sicklylife <translation@sicklylife.jp>, 2019-2022.
# Yuki Okushi <huyuumi.dev@gmail.com>, 2020.
# Peniel Vargas <tsuneake.kaemitsu@gmail.com>, 2021.
#
......@@ -27,7 +27,7 @@ msgstr ""
"Project-Id-Version: nautilus master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/nautilus/issues\n"
"POT-Creation-Date: 2021-07-09 07:59+0000\n"
"PO-Revision-Date: 2021-07-11 19:30+0900\n"
"PO-Revision-Date: 2022-02-17 20:55+0900\n"
"Last-Translator: sicklylife <translation@sicklylife.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
"Language: ja\n"
......@@ -907,6 +907,26 @@ msgstr "著作権"
msgid "Rating"
msgstr "評価"
#. Translators: "N" and "S" stand for
#. * north and south in GPS coordinates.
#: extensions/image-properties/nautilus-image-properties-page.c:263
msgid "N"
msgstr "N"
#: extensions/image-properties/nautilus-image-properties-page.c:263
msgid "S"
msgstr "S"
#. Translators: "E" and "W" stand for
#. * east and west in GPS coordinates.
#: extensions/image-properties/nautilus-image-properties-page.c:267
msgid "E"
msgstr "E"
#: extensions/image-properties/nautilus-image-properties-page.c:267
msgid "W"
msgstr "W"
#. Translators: These are the coordinates of a position where a picture was taken.
#: extensions/image-properties/nautilus-image-properties-page.c:270
#, c-format
......@@ -2719,6 +2739,12 @@ msgstr "検索中…"
msgid "Are you sure you want to open all files?"
msgstr "本当にすべてのファイルを開きますか?"
#: src/nautilus-mime-actions.c:1000
#, c-format
msgid "This will open %d separate tab and window."
msgid_plural "This will open %d separate tabs and windows."
msgstr[0] "%d 個のタブとウィンドウを別々に開きます。"
#: src/nautilus-files-view.c:1201
#, c-format
msgid "This will open %'d separate tab."
......@@ -2741,6 +2767,10 @@ msgstr "OK(_O)"
msgid "Select Items Matching"
msgstr "パターンを指定してアイテムを選択"
#: src/resources/ui/nautilus-files-view-select-items.ui:34
msgid "Pattern"
msgstr "パターン"
#: src/nautilus-files-view.c:1782 src/nautilus-files-view.c:6053
#: src/nautilus-files-view.c:6514
msgid "_Select"
......@@ -2823,10 +2853,10 @@ msgstr "(%s)"
#. * message about the number of other items and the
#. * total size of those items.
#.
#: src/nautilus-files-view.c:3541
#: src/nautilus-files-view.c:3503
#, c-format
msgid "%s %s, %s %s"
msgstr "%s %s, %s %s"
msgid "%s, %s"
msgstr "%s, %s"
#: src/nautilus-files-view.c:6040
msgid "Select Move Destination"
......@@ -3931,6 +3961,10 @@ msgid "%'d file operation active"
msgid_plural "%'d file operations active"
msgstr[0] "%'d 個のファイル操作を実行中です"
#: src/nautilus-progress-persistence-handler.c:148
msgid "All file operations have been completed"
msgstr "すべてのファイル操作が完了しました"
#: src/nautilus-progress-persistence-handler.c:148
msgid "All file operations have been successfully completed"
msgstr "すべてのファイル操作が正常に完了しました"
......@@ -4136,6 +4170,14 @@ msgstr "開く(_O)"
msgid "Search for “%s”"
msgstr "“%s”の検索"
#: src/nautilus-rename-file-popover-controller.c:371
msgid "Rename Folder"
msgstr "フォルダー名を変更"
#: src/nautilus-rename-file-popover-controller.c:372
msgid "Rename File"
msgstr "ファイル名を変更"
#: src/nautilus-rename-file-popover-controller.c:381
msgid "File name"
msgstr "ファイル名"
......@@ -4209,6 +4251,19 @@ msgstr "元に戻す(_U)"
msgid "_Redo"
msgstr "やり直す(_R)"
#: src/nautilus-trash-bar.c:232
msgid "Trashed items are automatically deleted after a period of time"
msgstr ""
"ゴミ箱へ移動したアイテムは一定の期間が経過すると自動的に削除されます"
#: src/nautilus-trash-bar.c:249
msgid "_Settings"
msgstr "設定(_S)"
#: src/nautilus-trash-bar.c:252
msgid "Display system controls for trash content"
msgstr "ゴミ箱の内容に関するシステム設定を表示します"
#: src/nautilus-trash-bar.c:209
msgid "_Restore"
msgstr "元に戻す(_R)"
......@@ -4877,10 +4932,28 @@ msgstr "アーカイブを作成"
msgid "Archive name"
msgstr "アーカイブ名"
#: src/resources/ui/nautilus-compress-dialog.ui:214
msgid "Password"
msgstr "パスワード"
#: src/resources/ui/nautilus-compress-dialog.ui:226
msgid "Enter a password here."
msgstr "ここにパスワードを入力してください。"
#: src/resources/ui/nautilus-file-conflict-dialog.ui:105
msgid "_Reset"
msgstr "リセット(_R)"
#: src/resources/ui/nautilus-compress-dialog.ui:118
msgid "Compatible with all operating systems."
msgstr "すべてのオペレーティングシステムで使用可能です。"
#: src/resources/ui/nautilus-compress-dialog.ui:37
msgid "Password protected .zip, must be installed on Windows and Mac."
msgstr ""
"パスワードで保護された .zip です。Windows と Mac では別途アーカイバーのインス"
"トールが必要です。"
#: src/resources/ui/nautilus-compress-dialog.ui:131
msgid "Smaller archives but Linux and Mac only."
msgstr "アーカイブは小さくなりますが、Linux と Mac だけでしか使用できません。"
......