From 9edce545715ce06af1338b46c44a0e676445502a Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Tue, 14 Apr 2015 10:10:51 -0400
Subject: [PATCH] gui: xalign is deprecated

Remove references to it, fixing up the code where necessary.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 gui/queue.cpp                |  2 --
 share/ocarina/ocarina6.glade | 15 +++++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/gui/queue.cpp b/gui/queue.cpp
index d037e6a1..901ea9f7 100644
--- a/gui/queue.cpp
+++ b/gui/queue.cpp
@@ -95,12 +95,10 @@ QueueTab :: QueueTab(Queue *pq, unsigned int num)
 	/*
 	 * Create our tab widget
 	 */
-	q_tab_number.set_alignment(0, 0.5);
 	q_tab_size.set_justify(Gtk::JUSTIFY_CENTER);
 
 	q_tab_close.set_image_from_icon_name("window-close", Gtk::ICON_SIZE_MENU);
 	q_tab_close.set_relief(Gtk::RELIEF_NONE);
-	q_tab_close.set_alignment(1, 0.5);
 	q_tab_close.signal_clicked().connect(sigc::mem_fun(*this,
 					&QueueTab::on_close_clicked));
 
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index 8b065859..274d0960 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -473,7 +473,6 @@
                   <object class="GtkImage" id="image14">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="icon_name">media-optical</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -730,7 +729,6 @@
                   <object class="GtkImage" id="image15">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="icon_name">document-open-recent</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -1040,7 +1038,6 @@
                   <object class="GtkImage" id="image16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="icon_name">emblem-documents</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -1288,7 +1285,6 @@ Manager</property>
                   <object class="GtkImage" id="image8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="icon_name">system-file-manager</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -1562,7 +1558,6 @@ Manager</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
-                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -1627,9 +1622,9 @@ Manager</property>
                           <object class="GtkLabel" id="o_title">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="halign">start</property>
                             <property name="label" translatable="yes">&lt;span size='xx-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
-                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1641,9 +1636,9 @@ Manager</property>
                           <object class="GtkLabel" id="o_artist">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="halign">start</property>
                             <property name="label" translatable="yes">&lt;span size='x-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
-                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1655,9 +1650,9 @@ Manager</property>
                           <object class="GtkLabel" id="o_album">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="halign">start</property>
                             <property name="label" translatable="yes">&lt;span size='x-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
-                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1726,7 +1721,7 @@ Manager</property>
               <object class="GtkLabel" id="o_sorting_indicator">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">end</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1738,7 +1733,7 @@ Manager</property>
               <object class="GtkLabel" id="o_queue_time">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">end</property>
               </object>
               <packing>
                 <property name="expand">False</property>