diff --git a/SOURCES/Revert-application-add-common-startup-code.patch b/SOURCES/Revert-application-add-common-startup-code.patch new file mode 100644 index 0000000..a7751e5 --- /dev/null +++ b/SOURCES/Revert-application-add-common-startup-code.patch @@ -0,0 +1,93 @@ +From 5b40335c34a3b920348633274a03d073d1338a09 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Mon, 9 Jan 2023 13:12:17 +0100 +Subject: [PATCH] Revert "application: add common startup code" + +This reverts commit 23ae53870a39afe43548111b6432db39511a6e97. This +change was needed for split of desktop-related functionality, but it +seems no more needed to me. Let's revert those changes to make the +code a bit easier as a preparation for the next commits. +--- + src/nautilus-application.c | 31 ++++++------------------------- + src/nautilus-application.h | 1 - + 2 files changed, 6 insertions(+), 26 deletions(-) + +diff --git a/src/nautilus-application.c b/src/nautilus-application.c +index 22a01ad..829faa3 100644 +--- a/src/nautilus-application.c ++++ b/src/nautilus-application.c +@@ -1250,9 +1250,10 @@ on_application_shutdown (GApplication *application, + nautilus_icon_info_clear_caches (); + } + +-void +-nautilus_application_startup_common (NautilusApplication *self) ++static void ++nautilus_application_startup (GApplication *app) + { ++ NautilusApplication *self = NAUTILUS_APPLICATION (app); + NautilusApplicationPrivate *priv; + + nautilus_profile_start (NULL); +@@ -1269,6 +1270,9 @@ nautilus_application_startup_common (NautilusApplication *self) + + setup_theme_extensions (); + ++ /* create DBus manager */ ++ priv->fdb_manager = nautilus_freedesktop_dbus_new (); ++ + /* initialize preferences and create the global GSettings objects */ + nautilus_global_preferences_init (); + +@@ -1295,22 +1299,6 @@ nautilus_application_startup_common (NautilusApplication *self) + g_signal_connect (self, "shutdown", G_CALLBACK (on_application_shutdown), NULL); + } + +-static void +-nautilus_application_startup (GApplication *app) +-{ +- NautilusApplication *self = NAUTILUS_APPLICATION (app); +- NautilusApplicationPrivate *priv; +- +- nautilus_profile_start (NULL); +- priv = nautilus_application_get_instance_private (self); +- +- /* create DBus manager */ +- priv->fdb_manager = nautilus_freedesktop_dbus_new (); +- nautilus_application_startup_common (self); +- +- nautilus_profile_end (NULL); +-} +- + static gboolean + nautilus_application_dbus_register (GApplication *app, + GDBusConnection *connection, +@@ -1374,13 +1362,6 @@ update_dbus_opened_locations (NautilusApplication *self) + + priv = nautilus_application_get_instance_private (self); + +- /* Children of nautilus application could not handle the dbus, so don't +- * do anything in that case */ +- if (!priv->fdb_manager) +- { +- return; +- } +- + for (l = priv->windows; l != NULL; l = l->next) + { + window = l->data; +diff --git a/src/nautilus-application.h b/src/nautilus-application.h +index 197a276..5f15f06 100644 +--- a/src/nautilus-application.h ++++ b/src/nautilus-application.h +@@ -88,7 +88,6 @@ GtkWidget * nautilus_application_connect_server (NautilusApplication *applicatio + void nautilus_application_search (NautilusApplication *application, + const gchar *uri, + const gchar *text); +-void nautilus_application_startup_common (NautilusApplication *application); + G_END_DECLS + + #endif /* __NAUTILUS_APPLICATION_H__ */ +-- +2.38.1 + diff --git a/SOURCES/application-Export-FileManager1-iface-from-dbus_regi.patch b/SOURCES/application-Export-FileManager1-iface-from-dbus_regi.patch new file mode 100644 index 0000000..7cb136b --- /dev/null +++ b/SOURCES/application-Export-FileManager1-iface-from-dbus_regi.patch @@ -0,0 +1,304 @@ +From 1fa3039c67671fe53416b2575f3c305029ef4854 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Wed, 11 Jan 2023 09:55:41 +0100 +Subject: [PATCH] application: Export FileManager1 iface from dbus_register + vfunc + +The `org/freedesktop/FileManager1` interface is not currently exported +from the `dbus_register` vfunc. This causes issues for projects (e.g. +desktop-icons extension) that want to use all the Nautilus intefaces +over the `org.gnome.Nautilus` connection. Let's use the already established +connection and export the `FileManager1` interface from the `dbus_register` +vfunc. + +https://bugzilla.redhat.com/show_bug.cgi?id=2150894 +--- + src/nautilus-application.c | 17 ++-- + src/nautilus-freedesktop-dbus.c | 150 +++++++++++++++++++++++++------- + src/nautilus-freedesktop-dbus.h | 6 +- + 3 files changed, 136 insertions(+), 37 deletions(-) + +diff --git a/src/nautilus-application.c b/src/nautilus-application.c +index 829faa3..3bb3da1 100644 +--- a/src/nautilus-application.c ++++ b/src/nautilus-application.c +@@ -608,8 +608,6 @@ nautilus_application_finalize (GObject *object) + g_clear_object (&priv->progress_handler); + g_clear_object (&priv->bookmark_list); + +- g_clear_object (&priv->fdb_manager); +- + g_list_free (priv->windows); + + g_hash_table_destroy (priv->notifications); +@@ -1270,9 +1268,6 @@ nautilus_application_startup (GApplication *app) + + setup_theme_extensions (); + +- /* create DBus manager */ +- priv->fdb_manager = nautilus_freedesktop_dbus_new (); +- + /* initialize preferences and create the global GSettings objects */ + nautilus_global_preferences_init (); + +@@ -1315,6 +1310,12 @@ nautilus_application_dbus_register (GApplication *app, + return FALSE; + } + ++ priv->fdb_manager = nautilus_freedesktop_dbus_new (connection); ++ if (!nautilus_freedesktop_dbus_register (priv->fdb_manager, error)) ++ { ++ return FALSE; ++ } ++ + priv->search_provider = nautilus_shell_search_provider_new (); + if (!nautilus_shell_search_provider_register (priv->search_provider, connection, error)) + { +@@ -1339,6 +1340,12 @@ nautilus_application_dbus_unregister (GApplication *app, + g_clear_object (&priv->dbus_manager); + } + ++ if (priv->fdb_manager) ++ { ++ nautilus_freedesktop_dbus_unregister (priv->fdb_manager); ++ g_clear_object (&priv->fdb_manager); ++ } ++ + if (priv->search_provider) + { + nautilus_shell_search_provider_unregister (priv->search_provider); +diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c +index b888099..d013e20 100644 +--- a/src/nautilus-freedesktop-dbus.c ++++ b/src/nautilus-freedesktop-dbus.c +@@ -41,6 +41,14 @@ struct _NautilusFreedesktopDBus + + /* Our DBus implementation skeleton */ + NautilusFreedesktopFileManager1 *skeleton; ++ ++ GDBusConnection *connection; ++}; ++ ++enum ++{ ++ PROP_0, ++ PROP_CONNECTION, + }; + + struct _NautilusFreedesktopDBusClass +@@ -149,27 +157,6 @@ skeleton_handle_show_item_properties_cb (NautilusFreedesktopFileManager1 *object + return TRUE; + } + +-static void +-bus_acquired_cb (GDBusConnection *conn, +- const gchar *name, +- gpointer user_data) +-{ +- NautilusFreedesktopDBus *fdb = user_data; +- +- DEBUG ("Bus acquired at %s", name); +- +- fdb->skeleton = nautilus_freedesktop_file_manager1_skeleton_new (); +- +- g_signal_connect (fdb->skeleton, "handle-show-items", +- G_CALLBACK (skeleton_handle_show_items_cb), fdb); +- g_signal_connect (fdb->skeleton, "handle-show-folders", +- G_CALLBACK (skeleton_handle_show_folders_cb), fdb); +- g_signal_connect (fdb->skeleton, "handle-show-item-properties", +- G_CALLBACK (skeleton_handle_show_item_properties_cb), fdb); +- +- g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (fdb->skeleton), conn, NAUTILUS_FDO_DBUS_PATH, NULL); +-} +- + static void + name_acquired_cb (GDBusConnection *connection, + const gchar *name, +@@ -186,6 +173,20 @@ name_lost_cb (GDBusConnection *connection, + DEBUG ("Lost (or failed to acquire) the name %s on the session message bus\n", name); + } + ++static void ++nautilus_freedesktop_dbus_constructed (GObject *object) ++{ ++ NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object); ++ ++ fdb->owner_id = g_bus_own_name_on_connection (fdb->connection, ++ NAUTILUS_FDO_DBUS_NAME, ++ G_BUS_NAME_OWNER_FLAGS_NONE, ++ name_acquired_cb, ++ name_lost_cb, ++ fdb, ++ NULL); ++} ++ + static void + nautilus_freedesktop_dbus_dispose (GObject *object) + { +@@ -199,33 +200,87 @@ nautilus_freedesktop_dbus_dispose (GObject *object) + + if (fdb->skeleton != NULL) + { +- g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (fdb->skeleton)); + g_object_unref (fdb->skeleton); + fdb->skeleton = NULL; + } + ++ g_clear_object (&fdb->connection); ++ + G_OBJECT_CLASS (nautilus_freedesktop_dbus_parent_class)->dispose (object); + } + ++static void ++nautilus_freedesktop_dbus_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object); ++ ++ switch (prop_id) ++ { ++ case PROP_CONNECTION: ++ { ++ g_set_object (&fdb->connection, g_value_get_object (value)); ++ } ++ break; ++ ++ default: ++ { ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ } ++ break; ++ } ++} ++ ++static void ++nautilus_freedesktop_dbus_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object); ++ ++ switch (prop_id) ++ { ++ case PROP_CONNECTION: ++ { ++ g_value_set_object (value, fdb->connection); ++ } ++ break; ++ ++ default: ++ { ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ } ++ break; ++ } ++} ++ + static void + nautilus_freedesktop_dbus_class_init (NautilusFreedesktopDBusClass *klass) + { + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = nautilus_freedesktop_dbus_dispose; ++ object_class->constructed = nautilus_freedesktop_dbus_constructed; ++ object_class->get_property = nautilus_freedesktop_dbus_get_property; ++ object_class->set_property = nautilus_freedesktop_dbus_set_property; ++ ++ g_object_class_install_property (object_class, ++ PROP_CONNECTION, ++ g_param_spec_object ("connection", ++ "Connection", ++ "GDBus connection property", ++ G_TYPE_DBUS_CONNECTION, ++ G_PARAM_CONSTRUCT_ONLY | ++ G_PARAM_READWRITE)); + } + + static void + nautilus_freedesktop_dbus_init (NautilusFreedesktopDBus *fdb) + { +- fdb->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, +- NAUTILUS_FDO_DBUS_NAME, +- G_BUS_NAME_OWNER_FLAGS_NONE, +- bus_acquired_cb, +- name_acquired_cb, +- name_lost_cb, +- fdb, +- NULL); ++ fdb->skeleton = nautilus_freedesktop_file_manager1_skeleton_new (); + } + + void +@@ -239,8 +294,41 @@ nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, + + /* Tries to own the org.freedesktop.FileManager1 service name */ + NautilusFreedesktopDBus * +-nautilus_freedesktop_dbus_new (void) ++nautilus_freedesktop_dbus_new (GDBusConnection *connection) + { + return g_object_new (nautilus_freedesktop_dbus_get_type (), ++ "connection", connection, + NULL); + } ++ ++gboolean ++nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, ++ GError **error) ++{ ++ gboolean success; ++ ++ success = g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (fdb->skeleton), ++ fdb->connection, ++ NAUTILUS_FDO_DBUS_PATH, ++ error); ++ ++ if (success) ++ { ++ g_signal_connect (fdb->skeleton, "handle-show-items", ++ G_CALLBACK (skeleton_handle_show_items_cb), fdb); ++ g_signal_connect (fdb->skeleton, "handle-show-folders", ++ G_CALLBACK (skeleton_handle_show_folders_cb), fdb); ++ g_signal_connect (fdb->skeleton, "handle-show-item-properties", ++ G_CALLBACK (skeleton_handle_show_item_properties_cb), fdb); ++ } ++ ++ return success; ++} ++ ++void ++nautilus_freedesktop_dbus_unregister (NautilusFreedesktopDBus *fdb) ++{ ++ g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (fdb->skeleton)); ++ ++ g_signal_handlers_disconnect_by_data (fdb->skeleton, fdb); ++} +diff --git a/src/nautilus-freedesktop-dbus.h b/src/nautilus-freedesktop-dbus.h +index 410c420..ee2ced5 100644 +--- a/src/nautilus-freedesktop-dbus.h ++++ b/src/nautilus-freedesktop-dbus.h +@@ -23,6 +23,7 @@ + #define __NAUTILUS_FREEDESKTOP_DBUS_H__ + + #include ++#include + + #define NAUTILUS_FDO_DBUS_IFACE "org.freedesktop.FileManager1" + #define NAUTILUS_FDO_DBUS_NAME "org.freedesktop.FileManager1" +@@ -44,7 +45,10 @@ typedef struct _NautilusFreedesktopDBus NautilusFreedesktopDBus; + typedef struct _NautilusFreedesktopDBusClass NautilusFreedesktopDBusClass; + + GType nautilus_freedesktop_dbus_get_type (void); +-NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void); ++NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (GDBusConnection *connection); ++ ++gboolean nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, GError **error); ++void nautilus_freedesktop_dbus_unregister (NautilusFreedesktopDBus *fdb); + + void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations); + +-- +2.38.1 + diff --git a/SOURCES/files-view-Backport-translations.patch b/SOURCES/files-view-Backport-translations.patch index e177a7c..cf6e7b0 100644 --- a/SOURCES/files-view-Backport-translations.patch +++ b/SOURCES/files-view-Backport-translations.patch @@ -1,156 +1,400 @@ +diff -ruN nautilus-3.28.1/po/bg.po nautilus-3.28.1.translations/po/bg.po +--- nautilus-3.28.1/po/bg.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/bg.po 2022-09-22 15:47:26.136428703 +0200 +@@ -5471,3 +5471,7 @@ + + #~ msgid "Enter server address…" + #~ msgstr "Въведете адреса на сървъра…" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Копиране на местоположение" diff -ruN nautilus-3.28.1/po/ca.po nautilus-3.28.1.translations/po/ca.po --- nautilus-3.28.1/po/ca.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/ca.po 2022-06-20 17:02:58.239093717 +0200 ++++ nautilus-3.28.1.translations/po/ca.po 2022-09-22 15:47:26.165428628 +0200 @@ -7061,3 +7061,7 @@ #~ "Amb el Nautilus heu d'haver rebut una còpia de la Llicència Pública " #~ "General de GNU; si no és així, escriviu a la Free Software Foundation, " #~ "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:24 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "_Copia la ubicació" +diff -ruN nautilus-3.28.1/po/cs.po nautilus-3.28.1.translations/po/cs.po +--- nautilus-3.28.1/po/cs.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/cs.po 2022-09-22 15:47:26.181428586 +0200 +@@ -5665,3 +5665,7 @@ + + #~ msgid "org.gnome.Nautilus" + #~ msgstr "org.gnome.Nautilus" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "Z_kopírovat umístění" +diff -ruN nautilus-3.28.1/po/da.po nautilus-3.28.1.translations/po/da.po +--- nautilus-3.28.1/po/da.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/da.po 2022-09-22 15:47:26.193428555 +0200 +@@ -7097,3 +7097,7 @@ + + #~ msgid "link" + #~ msgstr "henvisning" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Kopiér placering" diff -ruN nautilus-3.28.1/po/de.po nautilus-3.28.1.translations/po/de.po --- nautilus-3.28.1/po/de.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/de.po 2022-06-20 17:02:58.276093695 +0200 ++++ nautilus-3.28.1.translations/po/de.po 2022-09-22 15:47:26.201428534 +0200 @@ -5716,3 +5716,7 @@ #~ msgid "org.gnome.Nautilus" #~ msgstr "org.gnome.Nautilus" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:24 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "Ort _kopieren" +diff -ruN nautilus-3.28.1/po/el.po nautilus-3.28.1.translations/po/el.po +--- nautilus-3.28.1/po/el.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/el.po 2022-09-22 15:47:26.214428501 +0200 +@@ -5910,3 +5910,8 @@ + #~ msgstr "" + #~ "Ορίστε αυτό το όνομα αν θέλετε προσαρμοσμένο όνομα για το εικονίδιο του " + #~ "προσωπικού φακέλου στην επιφάνεια εργασίας." ++ ++# ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Αντιγραφή τοποθεσίας" +diff -ruN nautilus-3.28.1/po/en_GB.po nautilus-3.28.1.translations/po/en_GB.po +--- nautilus-3.28.1/po/en_GB.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/en_GB.po 2022-09-22 15:47:26.228428464 +0200 +@@ -9935,3 +9935,7 @@ + + #~ msgid "Question" + #~ msgstr "Question" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Copy Location" diff -ruN nautilus-3.28.1/po/es.po nautilus-3.28.1.translations/po/es.po --- nautilus-3.28.1/po/es.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/es.po 2022-06-20 17:02:58.309093676 +0200 ++++ nautilus-3.28.1.translations/po/es.po 2022-09-22 15:47:26.246428418 +0200 @@ -10830,3 +10830,8 @@ #~ msgstr "" #~ "Nautilus es un shell gráfico para GNOME que facilita la administración de " #~ "sus archivos y el resto de su sistema." + +# src/nautilus-location-bar.c:401 -+#: src/resources/ui/nautilus-files-view-context-menus.ui:24 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "Copiar _ubicación" +diff -ruN nautilus-3.28.1/po/eu.po nautilus-3.28.1.translations/po/eu.po +--- nautilus-3.28.1/po/eu.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/eu.po 2022-09-22 15:47:26.257428389 +0200 +@@ -8066,3 +8066,7 @@ + + #~ msgid "Clear contents of Go menu and Back/Forward lists" + #~ msgstr "Joan menuaren eta Atzera/Aurrera zerrenden edukia garbitzen du" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Kopiatu kokalekua" diff -ruN nautilus-3.28.1/po/fa.po nautilus-3.28.1.translations/po/fa.po --- nautilus-3.28.1/po/fa.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/fa.po 2022-06-20 17:02:58.327093666 +0200 ++++ nautilus-3.28.1.translations/po/fa.po 2022-09-22 15:47:26.268428361 +0200 @@ -10082,3 +10082,7 @@ #~ msgid "C_ancel Remove" #~ msgstr "ان_صراف از حذف" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:24 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "_رونوشت از مکان" +diff -ruN nautilus-3.28.1/po/fi.po nautilus-3.28.1.translations/po/fi.po +--- nautilus-3.28.1/po/fi.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/fi.po 2022-09-22 15:47:26.278428335 +0200 +@@ -6969,3 +6969,7 @@ + + #~ msgid "_Up" + #~ msgstr "_Ylös" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "Kopioi si_jainti" diff -ruN nautilus-3.28.1/po/fr.po nautilus-3.28.1.translations/po/fr.po --- nautilus-3.28.1/po/fr.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/fr.po 2022-06-20 17:02:58.339093659 +0200 ++++ nautilus-3.28.1.translations/po/fr.po 2022-09-22 15:47:26.286428314 +0200 @@ -5975,3 +5975,7 @@ #~ msgid "Copying “%B” to “%B”" #~ msgstr "Copie de « %B » vers « %B »" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:34 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "Co_pier l’emplacement" diff -ruN nautilus-3.28.1/po/fur.po nautilus-3.28.1.translations/po/fur.po --- nautilus-3.28.1/po/fur.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/fur.po 2022-06-20 17:02:58.348093654 +0200 ++++ nautilus-3.28.1.translations/po/fur.po 2022-09-22 15:47:26.295428291 +0200 @@ -7711,3 +7711,7 @@ #~ msgid "Set the zoom level of the current view" #~ msgstr "Imposte il nivel di zoom de viodude atuâl" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:24 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:34 +msgid "_Copy Location" +msgstr "_Copie posizion" diff -ruN nautilus-3.28.1/po/gl.po nautilus-3.28.1.translations/po/gl.po --- nautilus-3.28.1/po/gl.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/gl.po 2022-06-20 17:02:58.366093644 +0200 -@@ -7429,3 +7429,8 @@ ++++ nautilus-3.28.1.translations/po/gl.po 2022-09-22 15:47:26.315428239 +0200 +@@ -7429,3 +7429,7 @@ #~ msgid "Error autorunning software" #~ msgstr "Produciuse un erro ao autoexecutar o software" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:24 -+#| msgid "Location" ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "_Copiar localización" diff -ruN nautilus-3.28.1/po/he.po nautilus-3.28.1.translations/po/he.po --- nautilus-3.28.1/po/he.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/he.po 2022-06-20 17:02:58.387093632 +0200 ++++ nautilus-3.28.1.translations/po/he.po 2022-09-22 15:47:26.336428185 +0200 @@ -10468,3 +10468,7 @@ #~ msgid "Question" #~ msgstr "שאלה" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:34 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "ה_עתקת מיקום" +diff -ruN nautilus-3.28.1/po/hr.po nautilus-3.28.1.translations/po/hr.po +--- nautilus-3.28.1/po/hr.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/hr.po 2022-09-22 15:47:26.349428151 +0200 +@@ -6064,3 +6064,7 @@ + + #~ msgid "Re_verse Order" + #~ msgstr "Ob_rni poredak" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Kopiraj lokaciju" +diff -ruN nautilus-3.28.1/po/hu.po nautilus-3.28.1.translations/po/hu.po +--- nautilus-3.28.1/po/hu.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/hu.po 2022-09-22 15:47:26.358428127 +0200 +@@ -5566,3 +5566,8 @@ + + #~ msgid "org.gnome.Nautilus" + #~ msgstr "org.gnome.Nautilus" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++#| msgid "Location" ++msgid "_Copy Location" ++msgstr "Hely má_solása" +diff -ruN nautilus-3.28.1/po/id.po nautilus-3.28.1.translations/po/id.po +--- nautilus-3.28.1/po/id.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/id.po 2022-09-22 15:47:26.369428099 +0200 +@@ -5500,3 +5500,7 @@ + #: src/gtk/nautilusgtkplacesview.ui:472 + msgid "Enter server address…" + msgstr "Masukkan alamat server…" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Salin Lokasi" +diff -ruN nautilus-3.28.1/po/ka.po nautilus-3.28.1.translations/po/ka.po +--- nautilus-3.28.1/po/ka.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/ka.po 2022-09-22 15:47:26.396428029 +0200 +@@ -6877,3 +6877,7 @@ + + #~ msgid "Video CD" + #~ msgstr "ვიდეო CD ფორმატში" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_მდებარეობის კოპირება" +diff -ruN nautilus-3.28.1/po/kk.po nautilus-3.28.1.translations/po/kk.po +--- nautilus-3.28.1/po/kk.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/kk.po 2022-09-22 15:47:26.405428006 +0200 +@@ -7442,3 +7442,7 @@ + #~ msgstr "" + #~ "Қоқыс шелегін тазартуды таңдасаңыз, құрамасы жойылады. Оларды жеке-жеке " + #~ "өшіруге болатынын есте сақтаңыз." ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "Орналасуын _көшіріп алу" +diff -ruN nautilus-3.28.1/po/ko.po nautilus-3.28.1.translations/po/ko.po +--- nautilus-3.28.1/po/ko.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/ko.po 2022-09-22 15:47:26.421427964 +0200 +@@ -5763,3 +5763,7 @@ + #~ msgctxt "shortcut window" + #~ msgid "Bookmarks" + #~ msgstr "책갈피" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "위치 복사(_C)" +diff -ruN nautilus-3.28.1/po/lt.po nautilus-3.28.1.translations/po/lt.po +--- nautilus-3.28.1/po/lt.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/lt.po 2022-09-22 15:47:26.444427904 +0200 +@@ -7075,3 +7075,7 @@ + + #~ msgid "_Up" + #~ msgstr "_Aukštyn" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Kopijuoti vietą" +diff -ruN nautilus-3.28.1/po/lv.po nautilus-3.28.1.translations/po/lv.po +--- nautilus-3.28.1/po/lv.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/lv.po 2022-09-22 15:47:26.453427881 +0200 +@@ -5648,3 +5648,8 @@ + + #~ msgid "org.gnome.Nautilus" + #~ msgstr "org.gnome.Nautilus" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++#| msgid "Location" ++msgid "_Copy Location" ++msgstr "_Kopēt atrašanās vietu" +diff -ruN nautilus-3.28.1/po/nl.po nautilus-3.28.1.translations/po/nl.po +--- nautilus-3.28.1/po/nl.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/nl.po 2022-09-22 15:47:26.504427749 +0200 +@@ -6405,3 +6405,7 @@ + + #~ msgid "Move Dow_n" + #~ msgstr "Naar b_eneden" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "Locatie _kopiëren" diff -ruN nautilus-3.28.1/po/oc.po nautilus-3.28.1.translations/po/oc.po --- nautilus-3.28.1/po/oc.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/oc.po 2022-06-20 17:02:58.523093554 +0200 ++++ nautilus-3.28.1.translations/po/oc.po 2022-09-22 15:47:26.520427708 +0200 @@ -6999,3 +6999,7 @@ #~ msgid "Rename “%s”" #~ msgstr "Renomenar lo fichièr « %s »" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:34 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "_Copiar l'emplaçament" +diff -ruN nautilus-3.28.1/po/pl.po nautilus-3.28.1.translations/po/pl.po +--- nautilus-3.28.1/po/pl.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/pl.po 2022-09-22 15:47:26.535427669 +0200 +@@ -5683,3 +5683,7 @@ + + #~ msgid "org.gnome.Nautilus" + #~ msgstr "org.gnome.Nautilus" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "S_kopiuj położenie" +diff -ruN nautilus-3.28.1/po/pt_BR.po nautilus-3.28.1.translations/po/pt_BR.po +--- nautilus-3.28.1/po/pt_BR.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/pt_BR.po 2022-09-22 15:47:26.547427638 +0200 +@@ -7152,3 +7152,7 @@ + + #~ msgid "_Bookmarks..." + #~ msgstr "_Marcadores..." ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Copiar local" diff -ruN nautilus-3.28.1/po/pt.po nautilus-3.28.1.translations/po/pt.po --- nautilus-3.28.1/po/pt.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/pt.po 2022-06-20 17:02:58.627093494 +0200 ++++ nautilus-3.28.1.translations/po/pt.po 2022-09-22 15:47:26.554427619 +0200 @@ -5944,3 +5944,7 @@ #~ msgid "Whether the row represents a network location" #~ msgstr "Se a linha representa uma localização de rede" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:34 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "_Copiar localização" diff -ruN nautilus-3.28.1/po/ru.po nautilus-3.28.1.translations/po/ru.po --- nautilus-3.28.1/po/ru.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/ru.po 2022-06-20 17:02:58.652093480 +0200 ++++ nautilus-3.28.1.translations/po/ru.po 2022-09-22 15:47:26.567427586 +0200 @@ -6177,3 +6177,7 @@ #~ msgctxt "Bookmark" #~ msgid "_Name" #~ msgstr "_Имя" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:34 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "_Копировать адрес" +diff -ruN nautilus-3.28.1/po/sl.po nautilus-3.28.1.translations/po/sl.po +--- nautilus-3.28.1/po/sl.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/sl.po 2022-09-22 15:47:26.586427537 +0200 +@@ -7338,3 +7338,7 @@ + + #~ msgid "_About Files" + #~ msgstr "_O programu" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "Kopiraj _mesto" +diff -ruN nautilus-3.28.1/po/sr.po nautilus-3.28.1.translations/po/sr.po +--- nautilus-3.28.1/po/sr.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/sr.po 2022-09-22 15:47:26.605427487 +0200 +@@ -7143,3 +7143,7 @@ + #~ "ако нисте, пишите Задужбини слободног софтвера на следећу адресу: „Free " + #~ "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " + #~ "02110-1301 USA“" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Копирај путању" +diff -ruN nautilus-3.28.1/po/sv.po nautilus-3.28.1.translations/po/sv.po +--- nautilus-3.28.1/po/sv.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/sv.po 2022-09-22 15:47:26.614427464 +0200 +@@ -6343,3 +6343,7 @@ + + #~ msgid "%a, %b %e %Y %T" + #~ msgstr "%a %-e %b %Y %T" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "_Kopiera plats" diff -ruN nautilus-3.28.1/po/tr.po nautilus-3.28.1.translations/po/tr.po --- nautilus-3.28.1/po/tr.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/tr.po 2022-06-20 17:02:58.776093409 +0200 ++++ nautilus-3.28.1.translations/po/tr.po 2022-09-22 15:47:26.640427397 +0200 @@ -6188,3 +6188,7 @@ #~ msgid "D_efault zoom level:" #~ msgstr "Ön_tanımlı yaklaştırma seviyesi:" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:24 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "Konumu _Kopyala" diff -ruN nautilus-3.28.1/po/uk.po nautilus-3.28.1.translations/po/uk.po --- nautilus-3.28.1/po/uk.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/uk.po 2022-06-20 17:02:58.808093390 +0200 ++++ nautilus-3.28.1.translations/po/uk.po 2022-09-22 15:47:26.652427365 +0200 @@ -7967,3 +7967,7 @@ #~ msgid "Set the zoom level of the current view" #~ msgstr "Встановити рівень масштабування поточного вікна" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:34 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "_Копіювати адресу" diff -ruN nautilus-3.28.1/po/zh_CN.po nautilus-3.28.1.translations/po/zh_CN.po --- nautilus-3.28.1/po/zh_CN.po 2018-04-09 22:02:06.000000000 +0200 -+++ nautilus-3.28.1.translations/po/zh_CN.po 2022-06-20 17:02:58.865093358 +0200 ++++ nautilus-3.28.1.translations/po/zh_CN.po 2022-09-22 15:47:26.685427280 +0200 @@ -5495,3 +5495,7 @@ #~ msgid "Zoom In" #~ msgstr "放大" + -+#: src/resources/ui/nautilus-files-view-context-menus.ui:34 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 +msgid "_Copy Location" +msgstr "复制位置(_C)" +diff -ruN nautilus-3.28.1/po/zh_TW.po nautilus-3.28.1.translations/po/zh_TW.po +--- nautilus-3.28.1/po/zh_TW.po 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1.translations/po/zh_TW.po 2022-09-22 15:47:26.698427246 +0200 +@@ -7283,3 +7283,7 @@ + #~ "您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信" + #~ "給： the Free Software Foundation, Inc., 51 Franklin Street, Fifth " + #~ "Floor, Boston, MA 02110-1301 USA" ++ ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:53 ++msgid "_Copy Location" ++msgstr "複製位置(_C)" diff --git a/SOURCES/freedesktop-dbus-Try-to-own-the-name-until-after-exp.patch b/SOURCES/freedesktop-dbus-Try-to-own-the-name-until-after-exp.patch new file mode 100644 index 0000000..6d0fe2c --- /dev/null +++ b/SOURCES/freedesktop-dbus-Try-to-own-the-name-until-after-exp.patch @@ -0,0 +1,96 @@ +From ba878013689114bf199ba2260f9282ae82b352c4 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Wed, 22 Feb 2023 16:22:43 +0100 +Subject: [PATCH] freedesktop-dbus: Try to own the name until after exporting + skeleton + +Currently, the `g_bus_own_name_on_connection` function is called for the +`org.freedesktop.FileManager1` name before exporting the +`/org/freedesktop/FileManager1` skeleton. This seemingly works fine in most +cases, but occasionally the name is acquired too early and D-Bus clients +can get `No such interface` error. This is regression caused by the commit +2293e813d3cd1cc47b2b8750f7140647aa066fc8. Let's try to own the nam until +after exporting the skeleton to avoid this error. +--- + src/nautilus-freedesktop-dbus.c | 31 +++++++++++++++---------------- + 1 file changed, 15 insertions(+), 16 deletions(-) + +diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c +index c253cfaba..c20166abb 100644 +--- a/src/nautilus-freedesktop-dbus.c ++++ b/src/nautilus-freedesktop-dbus.c +@@ -162,20 +162,6 @@ name_lost_cb (GDBusConnection *connection, + DEBUG ("Lost (or failed to acquire) the name %s on the session message bus\n", name); + } + +-static void +-nautilus_freedesktop_dbus_constructed (GObject *object) +-{ +- NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object); +- +- fdb->owner_id = g_bus_own_name_on_connection (fdb->connection, +- NAUTILUS_FDO_DBUS_NAME, +- G_BUS_NAME_OWNER_FLAGS_NONE, +- name_acquired_cb, +- name_lost_cb, +- fdb, +- NULL); +-} +- + static void + nautilus_freedesktop_dbus_dispose (GObject *object) + { +@@ -252,7 +238,6 @@ nautilus_freedesktop_dbus_class_init (NautilusFreedesktopDBusClass *klass) + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = nautilus_freedesktop_dbus_dispose; +- object_class->constructed = nautilus_freedesktop_dbus_constructed; + object_class->get_property = nautilus_freedesktop_dbus_get_property; + object_class->set_property = nautilus_freedesktop_dbus_set_property; + +@@ -301,7 +286,6 @@ nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDB + nautilus_freedesktop_file_manager1_set_open_locations (fdb->skeleton, locations); + } + +-/* Tries to own the org.freedesktop.FileManager1 service name */ + NautilusFreedesktopDBus * + nautilus_freedesktop_dbus_new (GDBusConnection *connection) + { +@@ -310,6 +294,7 @@ nautilus_freedesktop_dbus_new (GDBusConnection *connection) + NULL); + } + ++/* Tries to own the org.freedesktop.FileManager1 service name */ + gboolean + nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, + GError **error) +@@ -331,12 +316,26 @@ nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, + G_CALLBACK (skeleton_handle_show_item_properties_cb), fdb); + } + ++ fdb->owner_id = g_bus_own_name_on_connection (fdb->connection, ++ NAUTILUS_FDO_DBUS_NAME, ++ G_BUS_NAME_OWNER_FLAGS_NONE, ++ name_acquired_cb, ++ name_lost_cb, ++ fdb, ++ NULL); ++ + return success; + } + + void + nautilus_freedesktop_dbus_unregister (NautilusFreedesktopDBus *fdb) + { ++ if (fdb->owner_id != 0) ++ { ++ g_bus_unown_name (fdb->owner_id); ++ fdb->owner_id = 0; ++ } ++ + g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (fdb->skeleton)); + + g_signal_handlers_disconnect_by_data (fdb->skeleton, fdb); +-- +2.39.1 + diff --git a/SPECS/nautilus.spec b/SPECS/nautilus.spec index 6cef126..5d868e7 100644 --- a/SPECS/nautilus.spec +++ b/SPECS/nautilus.spec @@ -8,7 +8,7 @@ Name: nautilus Version: 3.28.1 -Release: 20%{?dist} +Release: 23%{?dist} Summary: File manager for GNOME License: GPLv3+ @@ -84,6 +84,11 @@ Patch40: files-view-Backport-translations.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2106241 Patch41: nautilus-canvas-container-Remove-the-include-visible.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2150894 +Patch42: Revert-application-add-common-startup-code.patch +Patch43: application-Export-FileManager1-iface-from-dbus_regi.patch +Patch44: freedesktop-dbus-Try-to-own-the-name-until-after-exp.patch + BuildRequires: gtk-doc BuildRequires: meson BuildRequires: gcc @@ -196,6 +201,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop %{_datadir}/gir-1.0/*.gir %changelog +* Thu Feb 23 2023 Ondrej Holy - 3.28.1-23 +- Try to own the name until after exporting skeleton (#2150894) + +* Wed Feb 01 2023 Ondrej Holy - 3.28.1-22 +- Export FileManager1 iface from dbus_register vfunc (#2150894) + +* Thu Sep 22 2022 Ondrej Holy - 3.28.1-21 +- Backport "_Copy Location" translations (#2099981) + * Tue Aug 9 2022 Ondrej Holy - 3.28.1-20 - Fix scrolling issues in the icon view on focus changes (#2106241)