[Xfce4-commits] <parole:master> Revert spacings in the interface file as it brakes full screen mode

[Ali Abdallah]

Updating branch refs/heads/master
         to 8fff89e99d139620fcce992508302577cb1d9442 (commit)
       from 4c516026911d35ba6a8d9f30bdecb4996a3e3c3b (commit)

commit 8fff89e99d139620fcce992508302577cb1d9442
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Wed Sep 30 16:42:01 2009 +0000

    Revert spacings in the interface file as it brakes full screen mode

 data/interfaces/parole.ui |   24 ++++++------------------
 parole/parole-player.c    |    3 ++-
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 4040253..6fe1f24 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -301,13 +301,10 @@
                         <child>
                           <object class="GtkAlignment" id="alignment1">
                             <property name="visible">True</property>
-                            <property name="top_padding">1</property>
-                            <property name="left_padding">1</property>
                             <child>
                               <object class="GtkVBox" id="vbox8">
                                 <property name="visible">True</property>
                                 <property name="orientation">vertical</property>
-                                <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkHBox" id="output">
                                     <property name="visible">True</property>
@@ -576,7 +573,7 @@
                                                 </child>
                                                 <child>
                                                   <object class="GtkButton" id="leave_fs">
-                                                    <property name="label" translatable="yes">gtk-leave-fullscreen</property>
+                                                    <property name="label">gtk-leave-fullscreen</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
                                                     <property name="no_show_all">True</property>
@@ -634,24 +631,15 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkAlignment" id="alignment2">
+                          <object class="GtkNotebook" id="notebook-playlist">
                             <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">4</property>
-                            <property name="right_padding">6</property>
-                            <child>
-                              <object class="GtkNotebook" id="notebook-playlist">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="show_border">False</property>
-                                <property name="scrollable">True</property>
-                              </object>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="show_border">False</property>
+                            <property name="scrollable">True</property>
                           </object>
                           <packing>
                             <property name="resize">False</property>
-                            <property name="shrink">False</property>
+                            <property name="shrink">True</property>
                           </packing>
                         </child>
                       </object>
diff --git a/parole/parole-player.c b/parole/parole-player.c
index 1289592..8abfd64 100644
--- a/parole/parole-player.c
+++ b/parole/parole-player.c
@@ -488,6 +488,7 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
     gboolean seekable;
     
     player->priv->state = PAROLE_MEDIA_STATE_PLAYING;
+    
     pix = xfce_themed_icon_load ("player_play", 16);
     
     if ( !pix )
@@ -536,7 +537,7 @@ parole_player_paused (ParolePlayer *player)
     
     TRACE ("Player paused");
     
-    pix = xfce_themed_icon_load ("gtk-media-pause", 16);
+    pix = xfce_themed_icon_load (GTK_STOCK_MEDIA_PAUSE, 16);
     parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, pix);
     
     gtk_widget_set_sensitive (player->priv->play_pause, TRUE);