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

[Nathan Teodosio]

[Sebastien Bacher (seb128)]

Thanks!

review: Approve

diff --git a/data/gtkbuilder/UpdateManager.ui b/data/gtkbuilder/UpdateManager.ui
index d5321a2..7a53445 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 18.04.11 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 9e8c039..9e83e4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+update-manager (1:18.04.11.22) bionic; 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 15:39:44 +0100
+
 update-manager (1:18.04.11.21) bionic; urgency=medium
 
   * Fix incorrect available version for Ubuntu Pro updates in unattached case