changeset 16449:e4067cd1d2b2

Look for the new icons in the new directory and update the RPM spec file to match too.
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 26 Apr 2007 18:10:06 +0000
parents d11491f579fd
children 02782d054199 27dfbca8dd40
files pidgin.spec.in pidgin/gtkmain.c
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin.spec.in	Thu Apr 26 17:40:11 2007 +0000
+++ b/pidgin.spec.in	Thu Apr 26 18:10:06 2007 +0000
@@ -337,6 +337,7 @@
 
 %{_bindir}/pidgin
 %{_datadir}/pixmaps/pidgin
+%{_datadir}/icons/hicolor/*/apps/pidgin.png
 %dir %{_datadir}/sounds/pidgin
 %{_datadir}/sounds/pidgin/*
 %{_datadir}/applications/*
--- a/pidgin/gtkmain.c	Thu Apr 26 17:40:11 2007 +0000
+++ b/pidgin/gtkmain.c	Thu Apr 26 18:10:06 2007 +0000
@@ -241,10 +241,10 @@
 	char *icon_path;
 	int i;
 	const char *icon_sizes[] = {
-		"16",
-		"24",
-		"32",
-		"48"
+		"16x16",
+		"24x24",
+		"32x24",
+		"48x48"
 	};
 
 #endif
@@ -256,7 +256,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, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL);
+		icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
 		icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 		g_free(icon_path);
 		if (icon) {