Merge lp:~azzar1/software-properties/fix-1817352 into lp:software-properties

[Andrea Azzarone]

LivepatchPage: Make sure the scrolled window of the error message view is always visible

[Sebastien Bacher (seb128)]

That makes sense!

review: Approve

=== modified file 'data/gtkbuilder/main.ui'
--- data/gtkbuilder/main.ui	2019-02-18 16:16:13 +0000
+++ data/gtkbuilder/main.ui	2019-02-25 13:09:08 +0000
@@ -1203,7 +1203,7 @@
                     <property name="interpolate_size">True</property>
                     <child>
                       <object class="GtkScrolledWindow">
-                        <property name="visible">False</property>
+                        <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="shadow_type">in</property>
                         <child>

=== modified file 'softwareproperties/gtk/LivepatchPage.py'
--- softwareproperties/gtk/LivepatchPage.py	2019-02-07 19:35:56 +0000
+++ softwareproperties/gtk/LivepatchPage.py	2019-02-25 13:09:08 +0000
@@ -173,13 +173,13 @@
         availability_message = self._lps.props.availability_message
 
         has_error = (
-            error_message or
+            error_message is not None or
             (availability == LivepatchAvailability.FALSE and
              availability_message is not None))
 
         if has_error:
+            self._parent.stack_livepatch.set_visible_child_name('page_livepatch_message')
             self._parent.stack_livepatch.set_visible(True)
-            self._parent.stack_livepatch.set_visible_child_name('page_livepatch_message')
             text_buffer = self._parent.textview_livepatch.get_buffer()
             text_buffer.delete(
                 text_buffer.get_start_iter(), text_buffer.get_end_iter())
@@ -232,8 +232,8 @@
                 self._trigger_ui_update(skip=True, error_message=_('Failed to retrieve Livepatch status.'))
                 return
 
+        self._parent.stack_livepatch.set_visible_child_name('page_livepatch_status')
         self._parent.stack_livepatch.set_visible(True)
-        self._parent.stack_livepatch.set_visible_child_name('page_livepatch_status')
 
         check_state = status['Status'][0]['Livepatch']['CheckState'] if status else None
         state = status['Status'][0]['Livepatch']['State'] if status else None