? INSTALL
? devhelp-icon.patch
? m4/intltool.m4
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/devhelp/ChangeLog,v
retrieving revision 1.315
diff -u -p -d -r1.315 ChangeLog
--- ChangeLog	18 Feb 2006 09:34:34 -0000	1.315
+++ ChangeLog	18 Feb 2006 10:33:34 -0000
@@ -1,5 +1,24 @@
 2006-02-18  Behdad Esfahbod  <behdad@gnome.org>
 
+	* src/dh-main.c (main): Pass gettextized string to
+	g_set_application_name, as per glib docs recommendation.
+
+	* src/dh-main.c (main): Set default icon name to devhelp.
+
+	* src/dh-window.c (dh_window_new): Set window icon name
+	to devhelp (and no icon file tweaking at all.)
+
+	* ui/Makefile.am: Install PNG and SVG icons in the themeable
+	locations.  Call gtk-update-icon-cache.  Distribute ui/COPYING.
+	Fixes bug #330851.
+
+	* ui/devhelp.svg, ui/devhelp.png: Shiny new single red book icon
+	from Marcus Leyman. Fixes bug #144859.
+
+	* ui/COPYING: Copying infor for the new icon.
+
+2006-02-18  Behdad Esfahbod  <behdad@gnome.org>
+
 	* src/dh-base.c (base_init_books): Add books installed into user and
 	system data dirs. Patch from Antoine Dopffer. Fixes bug #328668.
 
Index: src/dh-main.c
===================================================================
RCS file: /cvs/gnome/devhelp/src/dh-main.c,v
retrieving revision 1.30
diff -u -p -d -r1.30 dh-main.c
--- src/dh-main.c	17 Feb 2006 22:39:35 -0000	1.30
+++ src/dh-main.c	18 Feb 2006 10:33:34 -0000
@@ -107,7 +107,8 @@ main (int argc, char **argv)
 		return 1;
 	}
 
-	g_set_application_name ("Devhelp");
+	g_set_application_name (_("Devhelp"));
+	gtk_window_set_default_icon_name ("devhelp");
 
 	message_conn = bacon_message_connection_new ("Devhelp");
 	if (!bacon_message_connection_get_is_server (message_conn)) {
Index: src/dh-window.c
===================================================================
RCS file: /cvs/gnome/devhelp/src/dh-window.c,v
retrieving revision 1.58
diff -u -p -d -r1.58 dh-window.c
--- src/dh-window.c	19 Nov 2005 16:35:45 -0000	1.58
+++ src/dh-window.c	18 Feb 2006 10:33:34 -0000
@@ -1087,7 +1087,6 @@ dh_window_new (DhBase *base)
 {
         DhWindow     *window;
         DhWindowPriv *priv;
-	GdkPixbuf    *icon;
 
         window = g_object_new (DH_TYPE_WINDOW, NULL);
         priv = window->priv;
@@ -1102,12 +1101,7 @@ dh_window_new (DhBase *base)
 	window_populate (window);
 	window_restore_state (window);
 
-	icon = gdk_pixbuf_new_from_file (DATA_DIR "/pixmaps/devhelp.png",
-					 NULL);
-	if (icon) {
-		gtk_window_set_icon (GTK_WINDOW (window), icon);
-		g_object_unref (icon);
-	}
+	gtk_window_set_icon_name (GTK_WINDOW (window), "devhelp");
 
 	return GTK_WIDGET (window);
 }
Index: ui/Makefile.am
===================================================================
RCS file: /cvs/gnome/devhelp/ui/Makefile.am,v
retrieving revision 1.7
diff -u -p -d -r1.7 Makefile.am
--- ui/Makefile.am	16 Mar 2004 01:11:04 -0000	1.7
+++ ui/Makefile.am	18 Feb 2006 10:33:34 -0000
@@ -4,9 +4,12 @@ image_DATA = 		\
 	book_closed.png \
 	helpdoc.png
 
-appicondir = $(datadir)/pixmaps
+appicondir = $(datadir)/icons/hicolor/48x48/apps
 appicon_DATA = devhelp.png
 
+svgicondir = $(datadir)/icons/hicolor/scalable/48x48/apps
+svgicon_DATA = devhelp.svg
+
 uidir = $(datadir)/devhelp/ui
 ui_DATA = 				\
 	window.ui
@@ -18,4 +21,8 @@ glade_DATA =                            
 EXTRA_DIST = $(image_DATA) 		\
 	     $(appicon_DATA)		\
 	     $(ui_DATA)                 \
-	     $(glade_DATA)
+	     $(glade_DATA)		\
+	     COPYING
+
+install-data-hook:
+	gtk-update-icon-cache -t $(datadir)/icons/hicolor || :
Index: ui/devhelp.png
===================================================================
RCS file: /cvs/gnome/devhelp/ui/devhelp.png,v
retrieving revision 1.1.1.1
diff -u -p -d -r1.1.1.1 devhelp.png
Binary files /tmp/cvs0plJDV and devhelp.png differ