[Xfce4-commits] r22618 - in xfmedia: branches/experimental/src trunk/src

[Brian Tarricone]

Author: kelnos
Date: 2006-08-02 05:40:33 +0000 (Wed, 02 Aug 2006)
New Revision: 22618

Modified:
   xfmedia/branches/experimental/src/playlist.c
   xfmedia/trunk/src/playlist.c
Log:
support icon naming spec for shuffle and repeat (even though tango is lame
for not including those icons)


Modified: xfmedia/branches/experimental/src/playlist.c
===================================================================
--- xfmedia/branches/experimental/src/playlist.c	2006-08-01 22:21:26 UTC (rev 22617)
+++ xfmedia/branches/experimental/src/playlist.c	2006-08-02 05:40:33 UTC (rev 22618)
@@ -1466,8 +1466,10 @@
     
     gtk_icon_size_lookup(GTK_ICON_SIZE_SMALL_TOOLBAR, &iw, &ih);
     
-    pix = xfce_icon_theme_load(icon_theme, "media-shuffle", iw);
+    pix = xfce_icon_theme_load(icon_theme, "media-playlist-shuffle", iw);
     if(!pix)
+        pix = xfce_icon_theme_load(icon_theme, "media-shuffle", iw);
+    if(!pix)
         pix = xfce_icon_theme_load(icon_theme, "stock_media-shuffle", iw);
     if(!pix)
         pix = xfce_icon_theme_load(icon_theme, "xfmedia-shuffle", iw);
@@ -1485,8 +1487,10 @@
             G_CALLBACK(xfmedia_playlist_shuffle_toggle_cb), plist);
     gtk_tooltips_set_tip(ttips, btn, _("Randomize play order"), NULL);
     
-    pix = xfce_icon_theme_load(icon_theme, "repeat", iw);
+    pix = xfce_icon_theme_load(icon_theme, "media-playlist-repeat", iw);
     if(!pix)
+        pix = xfce_icon_theme_load(icon_theme, "repeat", iw);
+    if(!pix)
         pix = xfce_icon_theme_load(icon_theme, "stock_repeat", iw);
     if(!pix)
         pix = xfce_icon_theme_load(icon_theme, "xfmedia-repeat", iw);

Modified: xfmedia/trunk/src/playlist.c
===================================================================
--- xfmedia/trunk/src/playlist.c	2006-08-01 22:21:26 UTC (rev 22617)
+++ xfmedia/trunk/src/playlist.c	2006-08-02 05:40:33 UTC (rev 22618)
@@ -1466,8 +1466,10 @@
     
     gtk_icon_size_lookup(GTK_ICON_SIZE_SMALL_TOOLBAR, &iw, &ih);
     
-    pix = xfce_icon_theme_load(icon_theme, "media-shuffle", iw);
+    pix = xfce_icon_theme_load(icon_theme, "media-playlist-shuffle", iw);
     if(!pix)
+        pix = xfce_icon_theme_load(icon_theme, "media-shuffle", iw);
+    if(!pix)
         pix = xfce_icon_theme_load(icon_theme, "stock_media-shuffle", iw);
     if(!pix)
         pix = xfce_icon_theme_load(icon_theme, "xfmedia-shuffle", iw);
@@ -1485,8 +1487,10 @@
             G_CALLBACK(xfmedia_playlist_shuffle_toggle_cb), plist);
     gtk_tooltips_set_tip(ttips, btn, _("Randomize play order"), NULL);
     
-    pix = xfce_icon_theme_load(icon_theme, "repeat", iw);
+    pix = xfce_icon_theme_load(icon_theme, "media-playlist-repeat", iw);
     if(!pix)
+        pix = xfce_icon_theme_load(icon_theme, "repeat", iw);
+    if(!pix)
         pix = xfce_icon_theme_load(icon_theme, "stock_repeat", iw);
     if(!pix)
         pix = xfce_icon_theme_load(icon_theme, "xfmedia-repeat", iw);