--- gnome-desktop-2.1.90/libgnome-desktop/gnome-desktop-item.c.crystalsvg	2002-12-10 00:01:24.000000000 +0100

+++ gnome-desktop-2.1.90/libgnome-desktop/gnome-desktop-item.c	2003-01-14 17:05:56.000000000 +0100

@@ -2316,10 +2316,10 @@

 }

 static char *kde_icondir = NULL;

-static GSList *hicolor_kde_48 = NULL;

-static GSList *hicolor_kde_32 = NULL;

-static GSList *hicolor_kde_22 = NULL;

-static GSList *hicolor_kde_16 = NULL;

+static GSList *crystalsvg_kde_48 = NULL;

+static GSList *crystalsvg_kde_32 = NULL;

+static GSList *crystalsvg_kde_22 = NULL;

+static GSList *crystalsvg_kde_16 = NULL;

 /* XXX: maybe we don't care about locolor

 static GSList *locolor_kde_48 = NULL;

 static GSList *locolor_kde_32 = NULL;

@@ -2373,10 +2373,10 @@

 	color ## _kde_ ## size = add_dirs (NULL, dirname);	\

 	g_free (dirname);

-	ADD_DIRS (hicolor, 48);

-	ADD_DIRS (hicolor, 32);

-	ADD_DIRS (hicolor, 22);

-	ADD_DIRS (hicolor, 16);

+	ADD_DIRS (crystalsvg, 48);

+	ADD_DIRS (crystalsvg, 32);

+	ADD_DIRS (crystalsvg, 22);

+	ADD_DIRS (crystalsvg, 16);

 /* XXX: maybe we don't care about locolor

 	ADD_DIRS (locolor, 48);

@@ -2397,36 +2397,36 @@

 	if (size > 32) {

 		/* 48-inf */

-		list = g_slist_concat (g_slist_copy (hicolor_kde_48),

-				       g_slist_copy (hicolor_kde_32));

+		list = g_slist_concat (g_slist_copy (crystalsvg_kde_48),

+				       g_slist_copy (crystalsvg_kde_32));

 		list = g_slist_concat (list,

-				       g_slist_copy (hicolor_kde_22));

+				       g_slist_copy (crystalsvg_kde_22));

 		list = g_slist_concat (list,

-				       g_slist_copy (hicolor_kde_16));

+				       g_slist_copy (crystalsvg_kde_16));

 	} else if (size > 22) {

 		/* 23-32 */

-		list = g_slist_concat (g_slist_copy (hicolor_kde_32),

-				       g_slist_copy (hicolor_kde_48));

+		list = g_slist_concat (g_slist_copy (crystalsvg_kde_32),

+				       g_slist_copy (crystalsvg_kde_48));

 		list = g_slist_concat (list,

-				       g_slist_copy (hicolor_kde_22));

+				       g_slist_copy (crystalsvg_kde_22));

 		list = g_slist_concat (list,

-				       g_slist_copy (hicolor_kde_16));

+				       g_slist_copy (crystalsvg_kde_16));

 	} else if (size > 16) {

 		/* 17-22 */

-		list = g_slist_concat (g_slist_copy (hicolor_kde_22),

-				       g_slist_copy (hicolor_kde_32));

+		list = g_slist_concat (g_slist_copy (crystalsvg_kde_22),

+				       g_slist_copy (crystalsvg_kde_32));

 		list = g_slist_concat (list,

-				       g_slist_copy (hicolor_kde_48));

+				       g_slist_copy (crystalsvg_kde_48));

 		list = g_slist_concat (list,

-				       g_slist_copy (hicolor_kde_16));

+				       g_slist_copy (crystalsvg_kde_16));

 	} else {

 		/* 1-16 */

-		list = g_slist_concat (g_slist_copy (hicolor_kde_16),

-				       g_slist_copy (hicolor_kde_22));

+		list = g_slist_concat (g_slist_copy (crystalsvg_kde_16),

+				       g_slist_copy (crystalsvg_kde_22));

 		list = g_slist_concat (list,

-				       g_slist_copy (hicolor_kde_32));

+				       g_slist_copy (crystalsvg_kde_32));

 		list = g_slist_concat (list,

-				       g_slist_copy (hicolor_kde_48));

+				       g_slist_copy (crystalsvg_kde_48));

 	}

 	list = g_slist_append (list, kde_icondir);