diff -up eggcups/ChangeLog eggcups-themeable/ChangeLog
--- eggcups/ChangeLog	2007-10-24 23:37:12.000000000 +0200
+++ eggcups-themeable/ChangeLog	2007-10-24 23:38:40.000000000 +0200
@@ -1,3 +1,9 @@
+2007-10-24  Luca Cavalli  <lcavalli@cvs.gnome.org>
+
+	* Makefile.am:
+	* ec-tray-icon.c: (ec_tray_icon_init): Use themeable icon.
+	* icon.png: Deleted.
+
 2007-01-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* gnome-default-printer.desktop.in: Use an icon-naming-spec
diff -up eggcups/ec-tray-icon.c eggcups-themeable/ec-tray-icon.c
--- eggcups/ec-tray-icon.c	2007-10-24 23:37:30.000000000 +0200
+++ eggcups-themeable/ec-tray-icon.c	2007-10-24 23:40:51.000000000 +0200
@@ -152,17 +152,14 @@ void
 ec_tray_icon_init (ECTrayIcon *icon)
 {
 	ECTrayIconPrivate *priv;
-	char *fname;
-	
+
 	priv = icon->priv = G_TYPE_INSTANCE_GET_PRIVATE (icon, EC_TYPE_TRAY_ICON, ECTrayIconPrivate);
 
 	priv->sensitive = FALSE;
 	priv->blink_count = 0;
 
-	fname = g_build_filename (IMAGEDIR, "icon.png", NULL);
-	gtk_status_icon_set_from_file (GTK_STATUS_ICON (icon), fname);
-	g_free (fname);
-	
+	gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (icon), "printer");
+
 	icon->priv->popup_factory = gtk_item_factory_new (GTK_TYPE_MENU,
 						  "<main>",
 						  NULL);
Common subdirectories: eggcups/m4 and eggcups-themeable/m4
diff -up eggcups/Makefile.am eggcups-themeable/Makefile.am
--- eggcups/Makefile.am	2007-10-24 23:37:30.000000000 +0200
+++ eggcups-themeable/Makefile.am	2007-10-24 23:39:07.000000000 +0200
@@ -6,7 +6,6 @@ INCLUDES =					\
 	-DEGGCUPS_CUPS_CONFIG_DIR=\"$(sysconfdir)/cups\" \
 	-DSHARE_DIR="\"$(pkgdatadir)\""		\
 	-DGLADEDIR="\"$(pkgdatadir)/glade\""	\
-	-DIMAGEDIR="\"$(pkgdatadir)\""		\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 
 bin_PROGRAMS = eggcups gnome-default-printer
@@ -53,9 +52,6 @@ eggcups_CFLAGS = -DDBUS_API_SUBJECT_TO_C
 
 gnome_default_printer_LDADD = $(EGGCUPS_LIBS)
 
-imagedir = $(datadir)/eggcups
-image_DATA = icon.png
-
 gladedir = $(datadir)/eggcups/glade
 glade_DATA = driverdialog.glade
 
@@ -84,7 +80,6 @@ EXTRA_DIST = \
 	autogen.sh \
 	cups-dbus.patch \
 	$(dbuspolicy_DATA) \
-	$(image_DATA) \
 	$(schema_DATA) \
 	$(desktop_in_files) \
 	$(glade_DATA)
Common subdirectories: eggcups/po and eggcups-themeable/po
Common subdirectories: eggcups/session-cups-config and eggcups-themeable/session-cups-config
Common subdirectories: eggcups/.svn and eggcups-themeable/.svn
