sound-juicer r2071 - in trunk: . src

[rburton svn gnome org]

Author: rburton
Date: Wed Feb 27 08:35:39 2008
New Revision: 2071
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2071&view=rev

Log:
2008-02-27  Ross Burton  <ross burtonini com>

	* src/sj-main.c:
	* src/sound-juicer.h:
	Don't create custom stock items when we can use the system ones.


Modified:
   trunk/ChangeLog
   trunk/src/sj-main.c
   trunk/src/sound-juicer.h

Modified: trunk/src/sj-main.c
==============================================================================
--- trunk/src/sj-main.c	(original)
+++ trunk/src/sj-main.c	Wed Feb 27 08:35:39 2008
@@ -120,8 +120,6 @@
 
   static const GtkStockItem sj_stock_items[] =
   {
-    { SJ_STOCK_PLAYING, NULL, 0, 0, NULL },
-    { SJ_STOCK_RECORDING, NULL, 0, 0, NULL },
     { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_Return, NULL }
   };
 
@@ -130,8 +128,6 @@
 
   sj_icon_factory = gtk_icon_factory_new ();
 
-  gtk_icon_factory_add (sj_icon_factory, SJ_STOCK_PLAYING, gtk_icon_factory_lookup_default (GTK_STOCK_MEDIA_PLAY));
-  gtk_icon_factory_add (sj_icon_factory, SJ_STOCK_RECORDING, gtk_icon_factory_lookup_default (GTK_STOCK_MEDIA_RECORD));
   gtk_icon_factory_add (sj_icon_factory, SJ_STOCK_EXTRACT, gtk_icon_factory_lookup_default (GTK_STOCK_CDROM));
 
   gtk_icon_factory_add_default (sj_icon_factory);
@@ -315,10 +311,10 @@
     g_object_set (G_OBJECT (cell), "stock-id", "", NULL);
     break;
   case STATE_PLAYING:
-    g_object_set (G_OBJECT (cell), "stock-id", SJ_STOCK_PLAYING, NULL);
+    g_object_set (G_OBJECT (cell), "stock-id", GTK_STOCK_MEDIA_PLAY, NULL);
     break;
   case STATE_EXTRACTING:
-    g_object_set (G_OBJECT (cell), "stock-id", SJ_STOCK_RECORDING, NULL);
+    g_object_set (G_OBJECT (cell), "stock-id", GTK_STOCK_MEDIA_RECORD, NULL);
     break;
   default:
     g_warning("Unhandled track state %d\n", state);

Modified: trunk/src/sound-juicer.h
==============================================================================
--- trunk/src/sound-juicer.h	(original)
+++ trunk/src/sound-juicer.h	Wed Feb 27 08:35:39 2008
@@ -168,8 +168,6 @@
 /**
  * Custom stock icons
  */
-#define SJ_STOCK_PLAYING "sj-stock-playing"
-#define SJ_STOCK_RECORDING "sj-stock-recording"
 #define SJ_STOCK_EXTRACT "sj-stock-extract"
 
 /* TODO: need to add a SjWindow object or something */