Georges Basile Stavracas Neto · Pawan Chitrakar · Debarshi Ray · Debarshi Ray · Debarshi Ray · Debarshi Ray
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ build-ubuntu:
  before_script:
    - sed -i '/deb-src/s/^# //' /etc/apt/sources.list
    - apt-get update
-    - apt-get install -y meson git libgtk-4-dev sassc
+    - apt-get install -y meson git libgtk-4-dev sassc libseccomp-dev
    - apt-get build-dep -y xdg-desktop-portal-gtk
    - git clone https://gitlab.gnome.org/GNOME/gnome-desktop.git &&
      cd gnome-desktop &&

--- a/NEWS
+++ b/NEWS
+Changes in 42.3
+================
+
+- Backport screencast session fixes
+
+Changes in 42.2
+================
+
+- Fix invalid usage of app chooder dialog after its destruction
+- Properly handle errors from file operations
+- Fix various memory leaks
+- Translation updates
+
 Changes in 42.1
 ================


--- a/meson.build
+++ b/meson.build
 project(
  'xdg-desktop-portal-gnome',
  'c',
-  version: '42.1',
+  version: '42.3',
  meson_version: '>= 0.53.0',
  license: 'LGPLv2.1+'
 )

--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -22,6 +22,7 @@ ja
 kk
 ko
 lt
+ne
 nl
 oc
 pa

--- a/po/ne.po
+++ b/po/ne.po
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Gnome Nepali Translation Project\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/issues\n"
+"POT-Creation-Date: 2022-04-26 23:39+0000\n"
+"PO-Revision-Date: 2022-05-09 11:39+0545\n"
+"Last-Translator: \n"
+"Language-Team: Nepali Team <chautari@gmail.com>\n"
+"Language: ne\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.0.1\n"
+"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,22,-1\n"
+
+#: data/xdg-desktop-portal-gnome.desktop.in.in:4
+msgid "Portal"
+msgstr ""
+
+#. TRANSLATORS: Don't translate this text (this is icon name)
+#: data/xdg-desktop-portal-gnome.desktop.in.in:6
+#, fuzzy
+msgid "applications-system-symbolic"
+msgstr " अनुप्रयोगहरू प्रणाली"
+
+#: src/accountdialog.c:152
+msgid "Select an Image"
+msgstr "छवि छनोट गर"
+
+#: src/accountdialog.c:155 src/wallpaperdialog.ui:14
+msgid "Cancel"
+msgstr "_रद्द"
+
+#: src/accountdialog.c:156
+msgid "Select"
+msgstr "चयन गर्नुहोस्"
+
+#: src/accountdialog.c:157
+msgid "Clear"
+msgstr "खाली गर्नुहोस्"
+
+#: src/accountdialog.c:164
+msgid "Images"
+msgstr "छवि"
+
+#: src/accountdialog.c:225
+#, c-format
+msgid "Share your personal information with %1$s? %2$s"
+msgstr ""
+
+#: src/accountdialog.c:231
+#, c-format
+msgid "Share your personal information with the requesting application? %s"
+msgstr ""
+
+#: src/accountdialog.ui:4
+msgid "Share Details"
+msgstr "विवरण साझा गर्नुहोस्"
+
+#: src/accountdialog.ui:12 src/appchooserdialog.ui:12 src/filechooser.c:452
+#: src/remotedesktopdialog.ui:13 src/screencastdialog.ui:14 src/screenshotdialog.ui:14
+msgid "_Cancel"
+msgstr "रद्द गर्नुहोस्"
+
+#: src/accountdialog.ui:19 src/remotedesktopdialog.ui:21 src/screencastdialog.ui:22
+#: src/screenshotdialog.ui:37
+msgid "_Share"
+msgstr "साझा गर्नुहोस्"
+
+#: src/accountdialog.ui:72
+msgid "Name"
+msgstr "नाम"
+
+#: src/accountdialog.ui:84
+msgid "Username"
+msgstr "प्रयोगकर्ताको नाम"
+
+#: src/appchooserdialog.c:229
+msgid "Failed to start Software"
+msgstr "सफ्टवेयर शुरु गर्न असक्षम"
+
+#: src/appchooserdialog.c:393
+#, c-format
+msgid "Choose an application to open the file “%s”."
+msgstr "अनुप्रयोग पिक्सम्याप फाइल पत्ता लगाउन सकेन: %s"
+
+#: src/appchooserdialog.c:398
+#, fuzzy
+msgid "Choose an application."
+msgstr "अनुप्रयोग छान्नुहोस्"
+
+#: src/appchooserdialog.c:415
+#, c-format
+msgid "No apps installed that can open “%s”. You can find more applications in Software"
+msgstr ""
+
+#: src/appchooserdialog.c:420
+msgid "No suitable app installed. You can find more applications in Software."
+msgstr ""
+
+#: src/appchooserdialog.ui:5
+#, fuzzy
+msgid "Open With…"
+msgstr "यससँग खोल्नुहोस्:"
+
+#: src/appchooserdialog.ui:20 src/filechooser.c:447
+msgid "_Open"
+msgstr " खोल्नुहोस्"
+
+#: src/appchooserdialog.ui:104
+msgid "No Apps available"
+msgstr "कुनै अनुप्रयोगहरू उपलब्ध छैन"
+
+#: src/appchooserdialog.ui:144
+msgid "_Find More in Software"
+msgstr "सफ्टवेयरमा अरू फेला पार्नुहोस्"
+
+#: src/background.c:214 src/background.c:305
+#, c-format
+msgid "“%s” is running in the background"
+msgstr "\"%s\" पृष्ठभूमिमा चलिरहेको छ"
+
+#: src/background.c:216
+msgid ""
+"This might be for a legitimate reason, but the application has not provided one.\n"
+"\n"
+"Note that forcing an application to quit might cause data loss."
+msgstr ""
+
+#: src/background.c:219
+msgid "Force quit"
+msgstr "बलपूर्वक बन्द गर्नुहोस्"
+
+#: src/background.c:220
+msgid "Allow"
+msgstr "अनुमति दिनुहोस्"
+
+#: src/background.c:303
+msgid "Background activity"
+msgstr "पृष्ठभूमि क्रियाकलाप"
+
+#: src/background.c:311
+msgid "Find out more"
+msgstr "अरू फेला पार्नुहोस्"
+
+#: src/filechooser.c:447
+msgid "_Select"
+msgstr "_चयन गर्नुहोस्"
+
+#: src/filechooser.c:449
+msgid "_Save"
+msgstr " बचत गर्नुहोस्..."
+
+#: src/filechooser.c:618
+msgid "Open files read-only"
+msgstr "पढ्ने मात्र फाइल खोल्नुहोस्"
+
+#: src/remotedesktopdialog.ui:7
+msgid "Remote desktop"
+msgstr "टाढाको डेस्कटप"
+
+#: src/remotedesktopdialog.ui:64
+#, fuzzy
+msgid "Allow remote interaction"
+msgstr "अनुमति दिनुहोस्"
+
+#: src/screencastdialog.ui:5
+msgid "Screen Share"
+msgstr "पर्दा साझेदारी"
+
+#: src/screencastwidget.c:159
+msgid "Virtual monitor"
+msgstr "अवास्तविक निगरानी"
+
+#: src/screencastwidget.c:542
+#, fuzzy, c-format
+msgid "Select monitor to share with %s"
+msgstr "%s मोनिटर"
+
+#: src/screencastwidget.c:544
+#, fuzzy, c-format
+msgid "Select window to share with %s"
+msgstr "सञ्झ्यालको उचाइ पिक्सेलमा"
+
+#: src/screencastwidget.c:549
+msgid "Select monitor to share with the requesting application"
+msgstr ""
+
+#: src/screencastwidget.c:550
+msgid "Select window to share with the requesting application"
+msgstr ""
+
+#: src/screencastwidget.ui:16
+#, fuzzy
+msgid "Single Window"
+msgstr "यदि बहुँविध सञ्झ्यालहरू खुला छन् भने पहिलो एउटा प्रयोग गरिने एकल सञ्झ्यालमा खोल्नुहोस्"
+
+#: src/screencastwidget.ui:40 src/screencastwidget.ui:86
+#, fuzzy
+msgid "Remember this selection"
+msgstr "सधैँ याद गर्नुहोस्"
+
+#: src/screencastwidget.ui:64
+msgid "Entire Screen"
+msgstr "पूरा पर्दा"
+
+#: src/screenshotdialog.c:420
+#, fuzzy, c-format
+msgid "Share this screenshot with %s?"
+msgstr "%s बाट स्क्रिनसट"
+
+#: src/screenshotdialog.c:424
+msgid "Share this screenshot with the requesting application?"
+msgstr ""
+
+#: src/screenshotdialog.ui:8
+msgid "Screenshot"
+msgstr "स्क्रिनसट"
+
+#: src/screenshotdialog.ui:30
+msgid "_Options…"
+msgstr "विकल्प…"
+
+#: src/screenshotdialog.ui:55
+msgid "Take _Screenshot"
+msgstr "स्क्रिनसट लिनुहोस्"
+
+#: src/screenshotdialog.ui:108
+msgid "Take Screenshot"
+msgstr "स्क्रिनसट लिनुहोस्"
+
+#: src/screenshotdialog.ui:118
+msgid "Grab the whole sc_reen"
+msgstr ""
+
+#: src/screenshotdialog.ui:128
+#, fuzzy
+msgid "Grab the current _window"
+msgstr ""
+"सम्पूर्ण डेस्कटपको सट्टा हालको सञ्झ्याल लिनुहोस्। यो कुञ्जी बिच्छेद गरिएको छ र यो अब प्रयोगमा छैन।"
+
+#: src/screenshotdialog.ui:138
+msgid "Select _area to grab"
+msgstr ""
+
+#: src/screenshotdialog.ui:150
+#, fuzzy
+msgid "Grab after a _delay of"
+msgstr "विलम्ब गर्नुहोस्:"
+
+#: src/screenshotdialog.ui:161
+msgid "seconds"
+msgstr "सेकेन्ड"
+
+#: src/screenshotdialog.ui:170
+msgid "Effects"
+msgstr "प्रभाव"
+
+#: src/screenshotdialog.ui:180
+#, fuzzy
+msgid "Include _pointer"
+msgstr "सूचक सम्मिलित गर्नुहोस्"
+
+#: src/screenshotdialog.ui:188
+#, fuzzy
+msgid "Include the window _border"
+msgstr "सूचक सम्मिलित गर्नुहोस्"
+
+#: src/settings.c:247
+#, fuzzy
+msgid "Requested setting not found"
+msgstr "अनुरोध गरिएको पृष्ठ '%s' कागजातमा फेला परेन।"
+
+#: src/wallpaperdialog.ui:8
+msgid "Set Background"
+msgstr "पृष्ठभूमि सेट गर्नुहोस्"
+
+#: src/wallpaperdialog.ui:20
+msgid "Set"
+msgstr "सेट गर्नुहोस्"
+
+#: src/wallpaperdialog.ui:51
+#, fuzzy
+msgid "Failed to load image file"
+msgstr "TIFF छवि लोड गर्न असफल"
+
+#: src/wallpaperpreview.ui:50
+msgid "Activities"
+msgstr "गतिविधिहरू"
--- a/src/appchooser.c
+++ b/src/appchooser.c
@@ -125,16 +125,15 @@ handle_close (XdpImplRequest *object,
 {
  GVariantBuilder opt_builder;

+  if (handle->request->exported)
+    request_unexport (handle->request);
+
  g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
  xdp_impl_app_chooser_complete_choose_application (handle->impl,
                                                    handle->invocation,
                                                    2,
                                                    g_variant_builder_end (&opt_builder));
  app_dialog_handle_close (handle);
-
-  if (handle->request->exported)
-    request_unexport (handle->request);
-
  xdp_impl_request_complete_close (object, invocation);

  return TRUE;

--- a/src/remotedesktop.c
+++ b/src/remotedesktop.c
@@ -130,7 +130,7 @@ remote_desktop_session_sources_selected (RemoteDesktopSession *session,
 static void
 remote_desktop_dialog_handle_free (RemoteDesktopDialogHandle *dialog_handle)
 {
-  g_clear_pointer ((GtkWindow**)&dialog_handle->dialog, gtk_window_destroy);
+  g_clear_pointer (&dialog_handle->dialog, gtk_window_destroy);
  g_clear_object (&dialog_handle->external_parent);
  g_object_unref (dialog_handle->request);


--- a/src/screencast.c
+++ b/src/screencast.c
@@ -100,7 +100,7 @@ is_screen_cast_session (Session *session)
 static void
 screen_cast_dialog_handle_free (ScreenCastDialogHandle *dialog_handle)
 {
-  g_clear_pointer ((GtkWindow**)&dialog_handle->dialog, gtk_window_destroy);
+  g_clear_pointer (&dialog_handle->dialog, gtk_window_destroy);
  g_clear_object (&dialog_handle->external_parent);
  g_object_unref (dialog_handle->request);

@@ -868,6 +868,9 @@ screen_cast_session_close (Session *session)
                   error->message);
      g_clear_object (&screen_cast_session->gnome_screen_cast_session);
    }
+
+  g_clear_pointer (&screen_cast_session->dialog_handle,
+                   screen_cast_dialog_handle_close);
 }

 static void

--- a/src/screencastwidget.c
+++ b/src/screencastwidget.c
@@ -538,7 +538,7 @@ screen_cast_widget_set_app_id (ScreenCastWidget *widget,
      if (info)
        display_name = g_app_info_get_display_name (info);
      else
-        display_name = g_strdup (app_id);
+        display_name = app_id;
      monitor_heading = g_strdup_printf (_("Select monitor to share with %s"),
                                         display_name);
      window_heading = g_strdup_printf (_("Select window to share with %s"),

--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -105,13 +105,17 @@ on_file_copy_cb (GObject *source_object,
    }

  destination = g_file_new_for_path (handle->picture_uri);
-  g_file_replace_contents (destination,
-                           contents,
-                           length,
-                           NULL, FALSE,
-                           G_FILE_CREATE_REPLACE_DESTINATION,
-                           NULL, NULL,
-                           &error);
+  if (!g_file_replace_contents (destination,
+                                contents,
+                                length,
+                                NULL, FALSE,
+                                G_FILE_CREATE_REPLACE_DESTINATION,
+                                NULL, NULL,
+                                &error))
+    {
+      g_warning ("Failed to store image as '%s': %s", handle->picture_uri, error->message);
+      goto out;
+    }

  if (set_gsettings (BACKGROUND_SCHEMA, handle->picture_uri))
    handle->response = 0;
@@ -198,7 +202,7 @@ handle_set_wallpaper_uri (XdpImplWallpaper *object,

  if (!show_preview)
    {
-      set_wallpaper (handle, g_strdup (arg_uri));
+      set_wallpaper (handle, arg_uri);
      goto out;
    }


--- a/src/wallpaperdialog.c
+++ b/src/wallpaperdialog.c
@@ -119,7 +119,7 @@ on_image_loaded_cb (GObject *source_object,
  WallpaperDialog *self = data;
  GFileIOStream *stream = NULL;
  GFile *image_file = G_FILE (source_object);
-  GFile *tmp = g_file_new_tmp ("XXXXXX", &stream, NULL);
+  g_autoptr(GFile) tmp = g_file_new_tmp ("XXXXXX", &stream, NULL);
  g_autoptr(GError) error = NULL;
  gchar *contents = NULL;
  gsize length = 0;
@@ -133,9 +133,13 @@ on_image_loaded_cb (GObject *source_object,
      return;
    }

-  g_file_replace_contents (tmp, contents, length, NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, NULL, &error);
+  if (!g_file_replace_contents (tmp, contents, length, NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, NULL, &error))
+    {
+      g_warning ("Failed to store image: %s", error->message);
+      return;
+    }

-  self->picture_uri = g_strdup (g_file_get_uri (tmp));
+  self->picture_uri = g_file_get_uri (tmp);
  wallpaper_preview_set_image (self->desktop_preview,
                               self->picture_uri);
 }

--- a/src/wallpaperpreview.ui
+++ b/src/wallpaperpreview.ui
@@ -2,24 +2,20 @@
 <interface domain="xdg-desktop-portal-gnome">
  <requires lib="gtk" version="4.0"/>
  <template class="WallpaperPreview" parent="GtkBox">
-    <property name="can-focus">0</property>
    <property name="hexpand">0</property>
    <property name="vexpand">0</property>
    <property name="width-request">384</property>
    <property name="height-request">208</property>
    <child>
      <object class="GtkOverlay">
-        <property name="can-focus">0</property>
        <property name="child">
          <object class="GtkDrawingArea" id="drawing_area">
-            <property name="can-focus">0</property>
            <property name="hexpand">1</property>
            <property name="vexpand">1</property>
          </object>
        </property>
        <child type="overlay">
          <object class="GtkStack" id="stack">
-            <property name="can-focus">0</property>
            <property name="hexpand">1</property>
            <property name="vexpand">1</property>
            <child>
@@ -36,48 +32,40 @@
            <!-- Top panel -->
            <child>
              <object class="GtkBox" id="desktop_preview">
-                <property name="can-focus">0</property>
                <property name="valign">start</property>
                <style>
                  <class name="desktop-preview"/>
                </style>
                <child>
                  <object class="GtkBox">
-                    <property name="can-focus">0</property>
                    <child>
                      <object class="GtkLabel">
-                        <property name="can-focus">0</property>
                        <property name="label" translatable="yes">Activities</property>
                      </object>
                    </child>
                    <child type="center">
                      <object class="GtkLabel" id="desktop_clock_label">
-                        <property name="can-focus">0</property>
                        <property name="hexpand">1</property>
                        <property name="label">01 Jan 00:00</property>
                      </object>
                    </child>
                    <child>
                      <object class="GtkBox">
-                        <property name="can-focus">0</property>
                        <property name="spacing">4</property>
                        <child>
                          <object class="GtkImage">
-                            <property name="can-focus">0</property>
                            <property name="icon-name">network-wireless-symbolic</property>
                            <property name="pixel-size">6</property>
                          </object>
                        </child>
                        <child>
                          <object class="GtkImage">
-                            <property name="can-focus">0</property>
                            <property name="icon-name">audio-volume-high-symbolic</property>
                            <property name="pixel-size">6</property>
                          </object>
                        </child>
                        <child>
                          <object class="GtkImage">
-                            <property name="can-focus">0</property>
                            <property name="icon-name">battery-low-symbolic</property>
                            <property name="pixel-size">6</property>
                          </object>
@@ -93,7 +81,6 @@

        <child type="overlay">
          <object class="GtkImage" id="animated_background_icon">
-            <property name="can-focus">0</property>
            <property name="halign">end</property>
            <property name="valign">end</property>
            <property name="margin-end">8</property>

--- a/src/xdg-desktop-portal-gnome.c
+++ b/src/xdg-desktop-portal-gnome.c
@@ -204,8 +204,18 @@ main (int argc, char *argv[])

  /* Avoid pointless and confusing recursion */
  g_unsetenv ("GTK_USE_PORTAL");
-  g_setenv ("ADW_DISABLE_PORTAL", "1", TRUE);
-  g_setenv ("GSK_RENDERER", "cairo", TRUE);
+
+  if (G_UNLIKELY (!g_setenv ("ADW_DISABLE_PORTAL", "1", TRUE)))
+    {
+      g_printerr ("Failed to set ADW_DISABLE_PORTAL: %s\n", g_strerror (errno));
+      return 1;
+    }
+
+  if (G_UNLIKELY (!g_setenv ("GSK_RENDERER", "cairo", TRUE)))
+    {
+      g_printerr ("Failed to set GSK_RENDERER: %s\n", g_strerror (errno));
+      return 1;
+    }

  gtk_init ();