From 49b71fa84358a6a9253ff9c4a18d37e9b47c5616 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Fri, 7 Nov 2014 16:46:32 +0100
Subject: [PATCH] printers: Don't use properties of deprecated widgets

Replace xalign and yalign properties by halign and
valign wherever needed.

https://bugzilla.gnome.org/show_bug.cgi?id=739737
---
 panels/printers/authentication-dialog.ui |  3 +--
 panels/printers/printers.ui              | 14 +++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/panels/printers/authentication-dialog.ui b/panels/printers/authentication-dialog.ui
index 06428abd0..965a2b4fa 100644
--- a/panels/printers/authentication-dialog.ui
+++ b/panels/printers/authentication-dialog.ui
@@ -151,8 +151,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="xalign">1</property>
-                <property name="yalign">0</property>
+                <property name="valign">start</property>
                 <property name="pixel_size">48</property>
                 <property name="icon_name">dialog-password-symbolic</property>
               </object>
diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index 90e935aab..1699dc06e 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -148,7 +148,7 @@
                     <child>
                       <object class="CcEditableEntry" id="printer-location-label">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
+                        <property name="halign">fill</property>
                         <property name="text">---</property>
                         <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
                         <accessibility>
@@ -166,8 +166,6 @@
                     <child>
                       <object class="CcEditableEntry" id="printer-status-label">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
                         <property name="text">Printing…</property>
                       </object>
                       <packing>
@@ -233,7 +231,6 @@
                     <child>
                       <object class="CcEditableEntry" id="printer-jobs-label">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
                         <property name="text" translatable="no">0 active</property>
                       </object>
                       <packing>
@@ -269,8 +266,8 @@
                     <child>
                       <object class="CcEditableEntry" id="printer-name-label">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">1</property>
+                        <property name="halign">fill</property>
+                        <property name="valign">end</property>
                         <property name="text">Printer</property>
                         <property name="weight">700</property>
                         <property name="scale">1.2</property>
@@ -285,7 +282,7 @@
                     <child>
                       <object class="GtkImage" id="printer-icon">
                         <property name="visible">True</property>
-                        <property name="xalign">1</property>
+                        <property name="halign">end</property>
                         <property name="pixel_size">64</property>
                         <property name="icon_name">printer</property>
                       </object>
@@ -422,7 +419,6 @@
                     <child>
                       <object class="CcEditableEntry" id="printer-ip-address-label">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
                         <property name="text">---</property>
                         <accessibility>
                           <relation type="labelled-by" target="label15"/>
@@ -591,7 +587,7 @@ doesn't seem to be available.</property>
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
+                    <property name="valign">start</property>
                     <property name="pixel_size">64</property>
                     <property name="icon_name">computer-fail</property>
                   </object>