From ced4f26e053bff5bb04205f623a179fc97fdfe52 Mon Sep 17 00:00:00 2001
From: Qball Cow <qball@gmpclient.org>
Date: Sun, 25 Sep 2011 15:14:31 +0200
Subject: [PATCH] Fix prev/play/stop/next buttons

---
 glade/playlist3.ui | 39 ++++++++++++++++++++++++---------------
 src/playlist3.c    | 17 +++++++++--------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/glade/playlist3.ui b/glade/playlist3.ui
index 1794e489..0f9a589e 100644
--- a/glade/playlist3.ui
+++ b/glade/playlist3.ui
@@ -443,14 +443,18 @@
                                 <child>
                                   <object class="GtkButton" id="button_previous">
                                     <property name="visible">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="related-action">MPDPrevious</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="label">gtk-media-previous</property>
-                                    <property name="use-stock">True</property>
+                                    <child>
+                                        <object class="GtkImage" id="button_previous_image">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-media-previous</property>
+                                        </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -459,15 +463,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkButton" id="top_button">
+                                  <object class="GtkButton" id="stop_button">
                                     <property name="visible">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="related-action">MPDStop</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="relief">none</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="label">gtk-media-stop</property>
-                                    <property name="use-stock">True</property>
+                                    <child>
+                                        <object class="GtkImage" id="button_stop_image">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-media-stop</property>
+                                        </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -478,12 +486,17 @@
                                 <child>
                                   <object class="GtkButton" id="play_button">
                                     <property name="visible">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="related-action">MPDPlayPause</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="relief">none</property>
-                                    <property name="use-stock">True</property>
-                                    <property name="label">gtk-media-play</property>
+                                    <child>
+                                        <object class="GtkImage" id="play_button_image">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-media-play</property>
+                                        </object>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -494,21 +507,17 @@
                                 <child>
                                   <object class="GtkButton" id="next_button">
                                     <property name="visible">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="related-action">MPDNext</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="relief">none</property>
-                                    <property name="label">gtk-media-next</property>
-                                    <property name="use-stock">True</property>
-                                    <!--
                                     <child>
-                                      <object class="GtkImage" id="image11">
+                                      <object class="GtkImage" id="next_button_image">
                                         <property name="visible">True</property>
                                         <property name="stock">gtk-media-next</property>
                                       </object>
                                     </child>
-                                    -->
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
diff --git a/src/playlist3.c b/src/playlist3.c
index 8b21d363..c6993574 100644
--- a/src/playlist3.c
+++ b/src/playlist3.c
@@ -1694,9 +1694,10 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
                  * Update the image in the menu
                  */
                 gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-pause");
-                gtk_button_set_label(GTK_BUTTON
+                gtk_image_set_from_stock(GTK_IMAGE
                     (gtk_builder_get_object
-                    (pl3_xml, "play_button")), "gtk-media-pause");
+                    (pl3_xml, "play_button_image")), "gtk-media-pause",
+					GTK_ICON_SIZE_MENU);
 
                 /**
                  * Update window title
@@ -1731,10 +1732,10 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
                 /** Update menu and button images */
 
                 gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-play");
-                gtk_button_set_label(GTK_BUTTON
+                gtk_image_set_from_stock(GTK_IMAGE
                     (gtk_builder_get_object
-                    (pl3_xml, "play_button")), "gtk-media-play");
-
+                    (pl3_xml, "play_button_image")), "gtk-media-play",
+					GTK_ICON_SIZE_MENU);
                 /**
                  * Set paused in Window string
                  */
@@ -1766,10 +1767,10 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
                 /* Make sure it's reset correctly */
                 gmpc_progress_set_time(GMPC_PROGRESS(new_pb), 0, 0);
 
-                gtk_button_set_label(GTK_BUTTON
+                gtk_image_set_from_stock(GTK_IMAGE
                     (gtk_builder_get_object
-                    (pl3_xml, "play_button")), "gtk-media-play");
-
+                    (pl3_xml, "play_button_image")), "gtk-media-play",
+					GTK_ICON_SIZE_MENU);
                 if (gmpc_profiles_get_number_of_profiles(gmpc_profiles) > 1)
                 {
                     gchar *id = gmpc_profiles_get_current(gmpc_profiles);
-- 
2.11.4.GIT