Index: gnomebaker.desktop.in
===================================================================
RCS file: /cvsroot/gnomebaker/gnomebaker/gnomebaker.desktop.in,v
retrieving revision 1.7
diff -u -r1.7 gnomebaker.desktop.in
--- gnomebaker.desktop.in	10 Jan 2006 00:06:23 -0000	1.7
+++ gnomebaker.desktop.in	14 Aug 2006 16:36:55 -0000
@@ -5,7 +5,7 @@
 Comment=Write CD and DVD
 Comment[da]=Brænd CD og DVD
 Exec=gnomebaker
-Icon=@prefix@/share/gnomebaker/gnomebaker-48.png
+Icon=gnomebaker-48
 Terminal=false
 Type=Application
 Categories=Application;AudioVideo;DiscBurning;
Index: pixmaps/Makefile.am
===================================================================
RCS file: /cvsroot/gnomebaker/gnomebaker/pixmaps/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- pixmaps/Makefile.am	14 Jan 2006 00:54:04 -0000	1.7
+++ pixmaps/Makefile.am	14 Aug 2006 16:36:55 -0000
@@ -8,7 +8,6 @@
 	baker-burn-cd.png\
 	baker-cd.png\
 	baker-data-copy.png\
-	gnomebaker-48.png\
 	splash_2.png\
 	baker-import-session.png\
 	baker-blank-dvdrw.png\
@@ -16,6 +15,7 @@
 	baker-cue-image.png\
 	baker-dvd-iso.png\
 	baker-remove-files.png\
+	gnomebaker-48.png\
 	state00.png\
 	state01.png\
 	state02.png\
@@ -30,6 +30,21 @@
 	state11.png\
 	state12.png\
 	state13.png
-	
 
-EXTRA_DIST = $(gnomebaker_pixmaps_DATA)
+icondir =$(datadir)/icons/hicolor/48x48/apps
+icon_DATA = gnomebaker-48.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+EXTRA_DIST = 				\
+	$(gnomebaker_pixmaps_DATA)	\
+	$(icon_DATA)
Index: src/main.c
===================================================================
RCS file: /cvsroot/gnomebaker/gnomebaker/src/main.c,v
retrieving revision 1.24
diff -u -r1.24 main.c
--- src/main.c	8 Jun 2006 22:46:46 -0000	1.24
+++ src/main.c	14 Aug 2006 16:36:56 -0000
@@ -92,6 +92,9 @@
 	glade_file = gnome_program_locate_file(NULL, GNOME_FILE_DOMAIN_APP_DATADIR,
 			"gnomebaker/gnomebaker.glade", FALSE, NULL);
 
+	g_set_application_name (_("GnomeBaker"));
+	gtk_window_set_default_icon_name ("gnomebaker-48");
+
 #if !defined(__linux__)
 	GtkWidget *dlg = splashdlg_new();
 #endif
Index: src/startdlg.c
===================================================================
RCS file: /cvsroot/gnomebaker/gnomebaker/src/startdlg.c,v
retrieving revision 1.46
diff -u -r1.46 startdlg.c
--- src/startdlg.c	10 Jun 2006 10:44:54 -0000	1.46
+++ src/startdlg.c	14 Aug 2006 16:36:57 -0000
@@ -548,12 +548,7 @@
     gtk_window_set_default_size(GTK_WINDOW(start_dlg->dialog), 320, -1);
     gtk_window_set_title(GTK_WINDOW(start_dlg->dialog), _(BurnTypeText[burn_type]));
     gtk_window_set_modal (GTK_WINDOW (start_dlg->dialog), TRUE);
-    GdkPixbuf *icon = gdk_pixbuf_new_from_file(IMAGEDIR"/gnomebaker-48.png", NULL);
-    if(icon != NULL)
-    {
-        gtk_window_set_icon(GTK_WINDOW (start_dlg->dialog), icon);
-        gdk_pixbuf_unref(icon);
-    }
+
     gtk_window_set_skip_taskbar_hint (GTK_WINDOW (start_dlg->dialog), TRUE);
     gtk_dialog_set_has_separator (start_dlg->dialog, FALSE);