Merge ~nteodosio/update-manager:jammy-ua into update-manager:ubuntu/jammy

[Nathan Teodosio]

Do not crash when updating Update Manager from inside itself.

Please refer to LP:2045918 for full context and test case.

[Julian Andres Klode (juliank)]

Ooh interesting. I wonder if we could solve this more general by just keeping the UI file in memory or something. It is surprising that it tries to re-read the file while running.

[Sebastien Bacher (seb128)]

We should probably make it a GResource (https://docs.gtk.org/gio/struct.Resource.html) going forward, which would make it included in the binary, but that's not going to fix that case today where upgrading from a previous version where it was not

[Sebastien Bacher (seb128)]

Thanks, I can confirm it's making the backtrace/error report issue go away. The corresponding widgets vanishes from the UI after the refresh but the details view is still working and the widget can be resized so that's good enough I think.

review: Approve

diff --git a/data/gtkbuilder/UpdateManager.ui b/data/gtkbuilder/UpdateManager.ui
index d82f816..c4f4362 100644
--- a/data/gtkbuilder/UpdateManager.ui
+++ b/data/gtkbuilder/UpdateManager.ui
@@ -5,6 +5,30 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="spacing">12</property>
+    <!--
+    https://launchpad.net/bugs/2045918
+    Old widgets from 22.04.9 need to be kept, even though invisible, because
+    otherwise updating Update Manager itself via Update Manager will crash when
+    Update Manager recalculates itself. That is because the old Update Manager
+    file is still the being executed, whereas this ui file will be the new one.
+    -->
+    <child>
+      <object class="GtkNotebook" id="notebook_details">
+        <property name="visible">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkExpander" id="expander_desc">
+        <property name="visible">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkTextView" id="textview_descr">
+        <property name="visible">False</property>
+      </object>
+    </child>
+    <!-- End of old widgets -->
+
     <child>
       <object class="GtkExpander" id="expander_news">
         <property name="visible">False</property>
diff --git a/debian/changelog b/debian/changelog
index a98fc5e..a7e662e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+update-manager (1:22.04.18) jammy; urgency=medium
+
+  * Add back removed widgets to UI file to fix crash when updating
+    Upgrade Manager from inside itself (LP: #2045918).
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Fri, 08 Dec 2023 11:23:26 +0100
+
 update-manager (1:22.04.17) jammy; urgency=medium
 
   * Fix incorrect available version for Ubuntu Pro updates in unattached case