From 939835cef1ddc98349ac4f8a3c2a3b3181345da9 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Fri, 17 Mar 2017 16:44:23 +0000
Subject: [PATCH] Fix warning with label glade files

---
 .../plugins/label/data/label_options.glade    | 24 +++++--------------
 .../plugins/label/data/label_pref.glade       | 19 +++++++++++----
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade b/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade
index 0d2cf8202..f0317726b 100644
--- a/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade
+++ b/deluge/plugins/Label/deluge/plugins/label/data/label_options.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-requires gtk+ 2.24 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkDialog" id="dlg_label_add">
     <property name="can_focus">False</property>
@@ -12,7 +12,7 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
-    <signal name="close" handler="on_label_cancel" swapped="no"/>
+    <signal name="close" handler="on_label_cancel"/>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
@@ -29,9 +29,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_add_cancel" swapped="no"/>
+                <signal name="clicked" handler="on_add_cancel"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -47,9 +46,8 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_add_ok" swapped="no"/>
+                <signal name="clicked" handler="on_add_ok"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -193,9 +191,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_options_cancel" swapped="no"/>
+                <signal name="clicked" handler="on_options_cancel"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -209,9 +206,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_options_ok" swapped="no"/>
+                <signal name="clicked" handler="on_options_ok"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -513,7 +509,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -570,7 +565,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="draw_indicator">True</property>
                           </widget>
                           <packing>
@@ -584,7 +578,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="draw_indicator">True</property>
                           </widget>
                           <packing>
@@ -600,7 +593,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="draw_indicator">True</property>
                           </widget>
                           <packing>
@@ -667,7 +659,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -715,7 +706,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="draw_indicator">True</property>
                           </widget>
                           <packing>
@@ -773,7 +763,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -857,7 +846,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
diff --git a/deluge/plugins/Label/deluge/plugins/label/data/label_pref.glade b/deluge/plugins/Label/deluge/plugins/label/data/label_pref.glade
index a25c613a5..edd0ea7db 100644
--- a/deluge/plugins/Label/deluge/plugins/label/data/label_pref.glade
+++ b/deluge/plugins/Label/deluge/plugins/label/data/label_pref.glade
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Aug 25 23:44:30 2008 -->
+<?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.24 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
     <child>
       <widget class="GtkVBox" id="label_prefs_box">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="spacing">5</property>
         <child>
           <widget class="GtkFrame" id="frame3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
-            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <property name="shadow_type">none</property>
             <child>
               <widget class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="left_padding">12</property>
                 <child>
                   <widget class="GtkLabel" id="label6">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">&lt;i&gt;Use the sidebar to add,edit and remove labels. &lt;/i&gt;
 </property>
                     <property name="use_markup">True</property>
@@ -29,6 +34,7 @@
             <child>
               <widget class="GtkLabel" id="label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">&lt;b&gt;Labels&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </widget>
@@ -37,6 +43,11 @@
               </packing>
             </child>
           </widget>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
       </widget>
     </child>