# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1177614123 0
# Node ID 02782d054199ea4a89c9367a02bd7f439b078318
# Parent  e4067cd1d2b2d9dcfacd2ff7423ba2787d4bc29f# Parent  ae857918240084ff318ea622d158da06c991feb3
merge of '92afc84de7fa4035c42fad7bfb05c642b526522f'
     and 'e7b7b057b6425e37dee9de2942d68773463dd531'

diff -r ae8579182400 -r 02782d054199 pidgin.spec.in
--- a/pidgin.spec.in	Thu Apr 26 19:00:29 2007 +0000
+++ b/pidgin.spec.in	Thu Apr 26 19:02:03 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/*
diff -r ae8579182400 -r 02782d054199 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Thu Apr 26 19:00:29 2007 +0000
+++ b/pidgin/gtkmain.c	Thu Apr 26 19:02:03 2007 +0000
@@ -241,10 +241,22 @@
 	char *icon_path;
 	int i;
 	const char *icon_sizes[] = {
+<<<<<<< variant A
+		"16x16",
+		"24x24",
+		"32x24",
+		"48x48"
+>>>>>>> variant B
 		"16x16",
 		"24x24",
 		"32x32",
 		"48x48"
+####### Ancestor
+		"16",
+		"24",
+		"32",
+		"48"
+======= end
 	};
 
 #endif
@@ -256,7 +268,13 @@
 #ifndef _WIN32
 	/* use the nice PNG icon for all the windows */
 	for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
+<<<<<<< variant A
+		icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
+>>>>>>> variant B
 		icon_path = g_build_filename(DATADIR, "pixmaps", "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
+####### Ancestor
+		icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL);
+======= end
 		icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 		g_free(icon_path);
 		if (icon) {