Źmicier Turok · Kjartan Maraas · Kai Lüke · Kai Lüke · Sebastien Bacher · Sebastien Bacher
--- a/NEWS
+++ b/NEWS
+3.38.2 - February 11, 2020
+==========================
+
+Kai Lüke:
+ * Ignore the --xid option when formatting from Nautilus
+   (this aligns the behavior under X11 with that on Wayland)
+
+Updated translations:
+ * Kjartan Maraas (nb), Źmicier Turok (be)
+
 3.38.1 - December 13, 2020
 ==========================


--- a/debian/changelog
+++ b/debian/changelog
-gnome-disk-utility (3.38.1-1ubuntu1) hirsute; urgency=medium
+gnome-disk-utility (3.38.2-1ubuntu1) hirsute; urgency=medium

  * Merge with unstable. Remaining changes:
    - Add dont-use-libdvdread.patch:
      + Revert commit that depends on libdvdread since it's in universe

- -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 19 Jan 2021 16:29:01 +0100
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 16 Feb 2021 16:50:29 +0100
+
+gnome-disk-utility (3.38.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 16 Feb 2021 16:46:34 +0100

 gnome-disk-utility (3.38.1-1) unstable; urgency=medium


--- a/meson.build
+++ b/meson.build
 project(
  'gnome-disk-utility', 'c',
-  version: '3.38.1',
+  version: '3.38.2',
  license: 'GPL2.0',
  default_options: 'buildtype=debugoptimized',
  meson_version: '>= 0.50.0',

--- a/po/be.po
+++ b/po/be.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/src/disks/gduapplication.c
+++ b/src/disks/gduapplication.c
@@ -195,14 +195,12 @@ gdu_application_command_line (GApplication            *_app,
  gchar *error_message = NULL;
  gboolean opt_format = FALSE;
  const gchar *opt_restore_disk_image = NULL;
-  gint opt_xid = -1;
  GVariantDict *options;

  options = g_application_command_line_get_options_dict (command_line);

  g_variant_dict_lookup (options, "block-device", "&s", &opt_block_device);
  g_variant_dict_lookup (options, "format-device", "b", &opt_format);
-  g_variant_dict_lookup (options, "xid", "i", &opt_xid);
  g_variant_dict_lookup (options, "restore-disk-image", "^&ay", &opt_restore_disk_image);
 
  if (opt_format && opt_block_device == NULL)
@@ -211,12 +209,6 @@ gdu_application_command_line (GApplication            *_app,
      goto out;
    }

-  if (opt_xid != -1 && !opt_format)
-    {
-      g_application_command_line_printerr (command_line, _("--format-device must be specified when using --xid\n"));
-      goto out;
-    }
-
  gdu_application_ensure_client (app);

  if (opt_block_device != NULL)
@@ -241,31 +233,22 @@ gdu_application_command_line (GApplication            *_app,
        }
    }

-  if (opt_xid == -1)
+  if (app->window == NULL)
    {
-      if (app->window == NULL)
-        {
-          g_application_activate (G_APPLICATION (app));
-        }
-      else
-        {
-          /* TODO: startup notification stuff */
-          gtk_window_present (GTK_WINDOW (app->window));
-        }
-
-      if (object_to_select != NULL)
-        {
-          gdu_window_select_object (app->window, object_to_select);
-          if (opt_format)
-            gdu_create_format_show (app->client, GTK_WINDOW (app->window), object_to_select,
-                                    FALSE, 0, 0, NULL, NULL);
-        }
+      g_application_activate (G_APPLICATION (app));
    }
-  else if (opt_format)
+  else
+    {
+      /* TODO: startup notification stuff */
+      gtk_window_present (GTK_WINDOW (app->window));
+    }
+
+  if (object_to_select != NULL)
    {
-      g_application_hold (_app);
-      gdu_create_format_show (app->client, NULL, object_to_select,
-                              FALSE, 0, 0, (GCallback) g_application_release, _app);
+      gdu_window_select_object (app->window, object_to_select);
+      if (opt_format)
+        gdu_create_format_show (app->client, GTK_WINDOW (app->window), object_to_select,
+                                FALSE, 0, 0, NULL, NULL);
    }

  if (opt_restore_disk_image != NULL)