From d66b717d0fe847979b2deac40cdf614eb60dda13 Mon Sep 17 00:00:00 2001
From: Pablo Barciela <scow@riseup.net>
Date: Sat, 3 Mar 2018 00:58:52 +0100
Subject: caja-bookmarks-window.ui: avoid deprecated:

avoid deprecated GtkVBox, GtkHBox and GtkLabel:xpad/ypad
---
 src/caja-bookmarks-window.ui | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/caja-bookmarks-window.ui b/src/caja-bookmarks-window.ui
index 9d15a1e7..ed3cd48f 100644
--- a/src/caja-bookmarks-window.ui
+++ b/src/caja-bookmarks-window.ui
@@ -33,6 +33,7 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
@@ -112,7 +113,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkBox" id="hbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">5</property>
@@ -123,16 +124,15 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkVBox" id="vbox1">
+                  <object class="GtkBox" id="vbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
                         <property name="label" translatable="yes">&lt;b&gt;_Bookmarks&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
@@ -147,15 +147,13 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox4">
+                      <object class="GtkBox" id="hbox4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
                             <property name="label">    </property>
                             <property name="xalign">0.5</property>
                             <property name="yalign">0.5</property>
@@ -211,21 +209,21 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
-                      <object class="GtkVBox" id="vbox4">
+                      <object class="GtkBox" id="vbox4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="bookmark_name_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
                             <property name="label" translatable="yes">&lt;b&gt;_Name&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                             <property name="use_underline">True</property>
@@ -239,15 +237,13 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox3">
+                          <object class="GtkBox" id="hbox3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" id="label3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
                                 <property name="label">    </property>
                                 <property name="xalign">0.5</property>
                                 <property name="yalign">0.5</property>
@@ -259,7 +255,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="bookmark_name_placeholder">
+                              <object class="GtkBox" id="bookmark_name_placeholder">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
@@ -287,16 +283,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="vbox3">
+                      <object class="GtkBox" id="vbox3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="bookmark_location_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xpad">2</property>
-                            <property name="ypad">2</property>
                             <property name="label" translatable="yes">&lt;b&gt;_Location&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                             <property name="use_underline">True</property>
@@ -310,15 +305,13 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox2">
+                          <object class="GtkBox" id="hbox2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" id="label2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xpad">0</property>
-                                <property name="ypad">0</property>
                                 <property name="label">    </property>
                                 <property name="xalign">0.5</property>
                                 <property name="yalign">0.5</property>
@@ -330,7 +323,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="bookmark_location_placeholder">
+                              <object class="GtkBox" id="bookmark_location_placeholder">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-- 
cgit v1.2.1