From 47eba1c5c2e2c5df3b5f367271898da92271ca84 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 23 Dec 2019 06:32:45 +0100
Subject: about-me: Fix UI validation

---
 capplets/about-me/mate-about-me-dialog.ui      | 38 +++++++++++++++++++---
 capplets/about-me/mate-about-me-fingerprint.ui | 45 ++++++++++++++++++++------
 capplets/about-me/mate-about-me-password.ui    | 42 ++++++++++++++++++++----
 3 files changed, 106 insertions(+), 19 deletions(-)

diff --git a/capplets/about-me/mate-about-me-dialog.ui b/capplets/about-me/mate-about-me-dialog.ui
index d33f7b9a..0061afe7 100644
--- a/capplets/about-me/mate-about-me-dialog.ui
+++ b/capplets/about-me/mate-about-me-dialog.ui
@@ -1,12 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.0
+
+mate-about-me-dialog - about me dialog window
+Copyright (C) MATE Developers
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+Author: Wolfgang Ulbrich
+
+-->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.22"/>
   <!-- interface-license-type gplv2 -->
   <!-- interface-name mate-about-me-dialog -->
   <!-- interface-description about me dialog window -->
   <!-- interface-copyright MATE Developers -->
   <!-- interface-authors Wolfgang Ulbrich -->
+  <object class="GtkImage" id="window_close_button_img">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">window-close</property>
+  </object>
   <object class="GtkDialog" id="about-me-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -25,12 +51,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="closebutton1">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="image">window_close_button_img</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -213,5 +240,8 @@
     <action-widgets>
       <action-widget response="-7">closebutton1</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/capplets/about-me/mate-about-me-fingerprint.ui b/capplets/about-me/mate-about-me-fingerprint.ui
index bf49c7a6..45f5fc4c 100644
--- a/capplets/about-me/mate-about-me-fingerprint.ui
+++ b/capplets/about-me/mate-about-me-fingerprint.ui
@@ -1,11 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.0
+
+mate-about-me-fingerprint - about me fingerprint dialog window
+Copyright (C) MATE Developers
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+Author: Wolfgang Ulbrich
+
+-->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.22"/>
   <!-- interface-license-type gplv2 -->
   <!-- interface-name mate-about-me-fingerprint -->
   <!-- interface-description about me fingerprint dialog window -->
-  <!-- interface-copyright MATE Developer -->
+  <!-- interface-copyright MATE Developers -->
   <!-- interface-authors Wolfgang Ulbrich -->
   <object class="GtkListStore" id="model1">
     <columns>
@@ -43,6 +64,9 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Enable Fingerprint Login</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <placeholder/>
     </child>
@@ -62,7 +86,7 @@
               <object class="GtkImage" id="image">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-dialog-info</property>
+                <property name="icon_name">dialog-information</property>
                 <property name="icon_size">6</property>
               </object>
               <packing>
@@ -220,7 +244,7 @@
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-no</property>
+                <property name="icon_name">gtk-no</property>
                 <property name="icon_size">6</property>
               </object>
               <packing>
@@ -233,7 +257,7 @@
               <object class="GtkImage" id="image2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-no</property>
+                <property name="icon_name">gtk-no</property>
                 <property name="icon_size">6</property>
               </object>
               <packing>
@@ -246,7 +270,7 @@
               <object class="GtkImage" id="image3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-no</property>
+                <property name="icon_name">gtk-no</property>
                 <property name="icon_size">6</property>
               </object>
               <packing>
@@ -259,7 +283,7 @@
               <object class="GtkImage" id="image4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-no</property>
+                <property name="icon_name">gtk-no</property>
                 <property name="icon_size">6</property>
               </object>
               <packing>
@@ -272,7 +296,7 @@
               <object class="GtkImage" id="image5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-no</property>
+                <property name="icon_name">gtk-no</property>
                 <property name="icon_size">6</property>
               </object>
               <packing>
@@ -321,6 +345,9 @@
         <property name="has_padding">False</property>
       </packing>
     </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child internal-child="action_area">
       <object class="GtkBox">
         <property name="can_focus">False</property>
diff --git a/capplets/about-me/mate-about-me-password.ui b/capplets/about-me/mate-about-me-password.ui
index c34e9010..92a7b308 100644
--- a/capplets/about-me/mate-about-me-password.ui
+++ b/capplets/about-me/mate-about-me-password.ui
@@ -1,11 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.0
+
+mate-about-me-password
+Copyright (C) MATE Developers
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+Author: Wolfgang Ulbrich
+
+-->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.22"/>
   <!-- interface-license-type gplv2 -->
   <!-- interface-name mate-about-me-password -->
   <!-- interface-copyright MATE Developers -->
   <!-- interface-authors Wolfgang Ulbrich -->
+  <object class="GtkImage" id="window_close_button_img">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">window-close</property>
+  </object>
   <object class="GtkDialog" id="change-password">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -25,12 +51,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel-button">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="image">window_close_button_img</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -74,7 +101,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
-                <property name="icon_name">gtk-dialog-authentication</property>
+                <property name="icon_name">dialog-password</property>
                 <property name="icon_size">6</property>
               </object>
               <packing>
@@ -234,7 +261,7 @@ After you have authenticated, enter your new password, retype it for verificatio
                                           <object class="GtkImage" id="image2">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="stock">gtk-apply</property>
+                                            <property name="icon_name">gtk-apply</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -349,5 +376,8 @@ After you have authenticated, enter your new password, retype it for verificatio
       <action-widget response="-7">cancel-button</action-widget>
       <action-widget response="-5">change-password-button</action-widget>
     </action-widgets>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
   </object>
 </interface>
-- 
cgit v1.2.1