From 215bb32e1e12875b444eefc93835d11985748f5f Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 25 Jul 2015 22:03:48 +0200
Subject: [PATCH] remove stock usage

---
 data/gui/filetransfers.ui | 25 ++++++++++++++++++-------
 data/gui/roster_window.ui |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/data/gui/filetransfers.ui b/data/gui/filetransfers.ui
index 24cfdd686..194d44f0b 100644
--- a/data/gui/filetransfers.ui
+++ b/data/gui/filetransfers.ui
@@ -56,12 +56,22 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-clear</property>
+    <property name="icon_name">gtk-clear</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-media-pause</property>
+    <property name="icon_name">media-playback-pause</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">gtk-cancel</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">gtk-close</property>
   </object>
   <object class="GtkWindow" id="file_transfers_window">
     <property name="can_focus">False</property>
@@ -86,7 +96,6 @@
               <object class="GtkTreeView" id="transfers_list">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="rules_hint">True</property>
                 <property name="enable_search">False</property>
                 <signal name="button-press-event" handler="on_transfers_list_button_press_event" swapped="no"/>
                 <signal name="button-release-event" handler="on_transfers_list_button_release_event" swapped="no"/>
@@ -163,14 +172,15 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete files</property>
-                <property name="use_stock">True</property>
+                <property name="image">image3</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="cancel_button-atkobject">
@@ -187,14 +197,15 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
+                <property name="label">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Hides the window</property>
-                <property name="use_stock">True</property>
+                <property name="image">image4</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/data/gui/roster_window.ui b/data/gui/roster_window.ui
index 5dbdc1af7..6b0611842 100644
--- a/data/gui/roster_window.ui
+++ b/data/gui/roster_window.ui
@@ -341,7 +341,7 @@
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
                     <property name="editable">False</property>
-                    <property name="primary_icon_stock">gtk-clear</property>
+                    <property name="primary_icon_name">gtk-clear</property>
                     <signal name="changed" handler="on_rfilter_entry_changed" swapped="no"/>
                     <signal name="icon-press" handler="on_rfilter_entry_icon_press" swapped="no"/>
                   </object>