From b8e617cce89159b172260896ad2404009e6efa01 Mon Sep 17 00:00:00 2001
From: Vendula Poncova <vponcova@redhat.com>
Date: Thu, 30 Mar 2017 15:22:35 +0200
Subject: [PATCH 1/2] Gtk: Fix overriding tab label for notebook (#1437106)

The gtk warning was caused by an empty page in the notebook.
The page was removed.

Resolves: rhbz#1437106
---
 org_fedora_oscap/gui/spokes/oscap.glade | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade
index 5ce20b0..7cc7a0d 100644
--- a/org_fedora_oscap/gui/spokes/oscap.glade
+++ b/org_fedora_oscap/gui/spokes/oscap.glade
@@ -406,20 +406,6 @@
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
-                    </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">Fetch Content</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkBox" id="contentUrlBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -554,7 +540,18 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label">Fetch Content</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                        <property name="tab_fill">False</property>
                       </packing>
                     </child>
                   </object>

From 8d2485856131cda7ccfafc75fddfb2156b48fe21 Mon Sep 17 00:00:00 2001
From: Vendula Poncova <vponcova@redhat.com>
Date: Thu, 30 Mar 2017 18:19:48 +0200
Subject: [PATCH 2/2] Gtk: Remove app_paintable from a nav box (#1437106)

The app_paintable property suppressed drawing of the upper bar's
background.

Resolves: rhbz#1437106
---
 org_fedora_oscap/gui/spokes/oscap.glade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade
index 7cc7a0d..45c8f07 100644
--- a/org_fedora_oscap/gui/spokes/oscap.glade
+++ b/org_fedora_oscap/gui/spokes/oscap.glade
@@ -46,7 +46,6 @@
         <property name="spacing">6</property>
         <child internal-child="nav_box">
           <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
-            <property name="app_paintable">True</property>
             <property name="can_focus">False</property>
             <child internal-child="nav_area">
               <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">