sound-juicer r2070 - in trunk: . data src

[rburton svn gnome org]

Author: rburton
Date: Tue Feb 26 22:10:13 2008
New Revision: 2070
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2070&view=rev

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

	* src/sj-main.c:
	Don't use custom icons for the playing/ripping status icons, but
	the g-i-t stock icons (#404546, Michael Monreal).
	
	* data/sj-play.png:
	* data/sj-record.png:
	* data/Makefile.am:
	Remove.


Removed:
   trunk/data/sj-play.png
   trunk/data/sj-record.png
Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am
   trunk/src/sj-main.c

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Feb 26 22:10:13 2008
@@ -1,5 +1,5 @@
 privatedatadir = $(pkgdatadir)
-privatedata_DATA = sound-juicer.glade sj-play.png sj-record.png
+dist_privatedata_DATA = sound-juicer.glade
 
 desktopdir = $(datadir)/applications
 desktop_in_files = sound-juicer.desktop.in.in
@@ -75,7 +75,6 @@
 	$(schema_DATA)
 
 EXTRA_DIST = \
-	$(privatedata_DATA) \
 	$(schema_in_files) \
 	$(man1_MANS) \
 	$(icons)

Modified: trunk/src/sj-main.c
==============================================================================
--- trunk/src/sj-main.c	(original)
+++ trunk/src/sj-main.c	Tue Feb 26 22:10:13 2008
@@ -112,37 +112,6 @@
 #define SOURCE_GLADE "../data/sound-juicer.glade"
 #define INSTALLED_GLADE DATADIR"/sound-juicer/sound-juicer.glade"
 
-static void
-add_stock_icon (GtkIconFactory *sj_icon_factory,
-                const gchar *stock_id,
-                GtkIconSize  size,
-                const gchar *file_name)
-{
-  GtkIconSource *source;
-  GtkIconSet    *set;
-  GdkPixbuf     *pixbuf;
-
-  source = gtk_icon_source_new ();
-
-  gtk_icon_source_set_size (source, size);
-  gtk_icon_source_set_size_wildcarded (source, FALSE);
-
-  pixbuf = gdk_pixbuf_new_from_file (file_name, NULL);
-
-  gtk_icon_source_set_pixbuf (source, pixbuf);
-
-  g_object_unref (pixbuf);
-
-  set = gtk_icon_set_new ();
-
-  gtk_icon_set_add_source (set, source);
-  gtk_icon_source_free (source);
-
-  gtk_icon_factory_add (sj_icon_factory, stock_id, set);
-
-  gtk_icon_set_unref (set);
-}
-
 void
 sj_stock_init (void)
 {
@@ -161,8 +130,8 @@
 
   sj_icon_factory = gtk_icon_factory_new ();
 
-  add_stock_icon (sj_icon_factory, SJ_STOCK_PLAYING, GTK_ICON_SIZE_MENU, PKGDATADIR"/sj-play.png");
-  add_stock_icon (sj_icon_factory, SJ_STOCK_RECORDING, GTK_ICON_SIZE_MENU, PKGDATADIR"/sj-record.png");
+  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);