changeset 16457:2b106533b077

Add the SVG to the default window icon list for really big window icons
author Sean Egan <seanegan@gmail.com>
date Thu, 26 Apr 2007 22:24:52 +0000
parents 81e3c44ecaac
children 0b57c2371077 5deee71dc64f
files pidgin/gtkmain.c pidgin/pixmaps/icons/48/scalable/Makefile.am
diffstat 2 files changed, 16 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkmain.c	Thu Apr 26 20:04:09 2007 +0000
+++ b/pidgin/gtkmain.c	Thu Apr 26 22:24:52 2007 +0000
@@ -240,11 +240,15 @@
 	GdkPixbuf *icon = NULL;
 	char *icon_path;
 	int i;
-	const char *icon_sizes[] = {
-		"16x16",
-		"24x24",
-		"32x32",
-		"48x48"
+	struct {
+		const char *dir;
+		const char *filename;
+	} icon_sizes[] = {
+		{"16x16", "pidgin.png"},
+		{"24x24", "pidgin.png"},
+		{"32x32", "pidgin.png"},
+		{"48x48", "pidgin.png"},
+		{"scalable", "pidgin.svg"}
 	};
 
 #endif
@@ -256,7 +260,7 @@
 #ifndef _WIN32
 	/* use the nice PNG icon for all the windows */
 	for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
-		icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
+		icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL);
 		icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 		g_free(icon_path);
 		if (icon) {
--- a/pidgin/pixmaps/icons/48/scalable/Makefile.am	Thu Apr 26 20:04:09 2007 +0000
+++ b/pidgin/pixmaps/icons/48/scalable/Makefile.am	Thu Apr 26 22:24:52 2007 +0000
@@ -1,1 +1,6 @@
-EXTRA_DIST = 	pidgin.svg
+EXTRA_DIST = pidgin.svg 
+
+pidginiconspixdir = $(datadir)/icons/hicolor/scalable/apps
+
+pidginiconspix_DATA = $(EXTRA_DIST)
+