Merge ~jawn-smith/software-properties:outdated_cache_error_dialog into software-properties:ubuntu/master

[William Wilson]

Changing the variable passed to the Error dialog to the correct variable type"

In the DialogCacheOutdated class, certain error scenarios were attempting to create a dialog message window. The first variable was passing the class rather than the class's parent window, as should happen.

[Brian Murray (brian-murray)]

This looks great but I didn't understand the commit before yours so have not uploaded this.

diff --git a/debian/changelog b/debian/changelog
index 1fd8844..b151b89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+software-properties (0.99.5) hirsute; urgency=medium
+
+  * Fixing an incorrect variable being passed to GTK message dialog creation
+    function (LP: #1829401)
+
+ -- William 'jawn-smith' Wilson <[e-mail]>  Mon, 25 Jan 2021 15:38:26 -0600
+
 software-properties (0.99.4) hirsute; urgency=medium
 
   * cloudarchive: Enable support for the Wallaby Ubuntu Cloud Archive on
diff --git a/softwareproperties/gtk/DialogCacheOutdated.py b/softwareproperties/gtk/DialogCacheOutdated.py
index 9ee671e..aa5c8a5 100644
--- a/softwareproperties/gtk/DialogCacheOutdated.py
+++ b/softwareproperties/gtk/DialogCacheOutdated.py
@@ -84,7 +84,7 @@ class DialogCacheOutdated:
         try:
             self._pktask.generic_finish(result)
         except Exception as e:
-            dialog = Gtk.MessageDialog(self, 0, Gtk.MessageType.ERROR,
+            dialog = Gtk.MessageDialog(self.parent, 0, Gtk.MessageType.ERROR,
                 Gtk.ButtonsType.CANCEL, _("Error while refreshing cache"))
             dialog.format_secondary_text(str(e))
             dialog.run()