100 lines
3.8 KiB
Plaintext
100 lines
3.8 KiB
Plaintext
|
diff -ruN gnome-desktop-2.2.2/libgnome-desktop/gnome-desktop-item.c gnome-desktop-n/libgnome-desktop/gnome-desktop-item.c
|
||
|
|
--- gnome-desktop-2.2.2/libgnome-desktop/gnome-desktop-item.c 2003-05-14 14:40:38.000000000 +0200
|
||
|
|
+++ gnome-desktop-n/libgnome-desktop/gnome-desktop-item.c 2003-09-15 14:55:59.000000000 +0200
|
||
|
|
@@ -2340,6 +2340,11 @@
|
||
|
|
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;
|
||
|
|
@@ -2397,6 +2402,10 @@
|
||
|
|
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);
|
||
|
|
@@ -2423,6 +2432,15 @@
|
||
|
|
g_slist_copy (hicolor_kde_22));
|
||
|
|
list = g_slist_concat (list,
|
||
|
|
g_slist_copy (hicolor_kde_16));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_48));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_32));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_16));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_22));
|
||
|
|
+
|
||
|
|
} else if (size > 22) {
|
||
|
|
/* 23-32 */
|
||
|
|
list = g_slist_concat (g_slist_copy (hicolor_kde_32),
|
||
|
|
@@ -2431,6 +2449,15 @@
|
||
|
|
g_slist_copy (hicolor_kde_22));
|
||
|
|
list = g_slist_concat (list,
|
||
|
|
g_slist_copy (hicolor_kde_16));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_48));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_32));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_16));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_22));
|
||
|
|
+
|
||
|
|
} else if (size > 16) {
|
||
|
|
/* 17-22 */
|
||
|
|
list = g_slist_concat (g_slist_copy (hicolor_kde_22),
|
||
|
|
@@ -2439,6 +2466,15 @@
|
||
|
|
g_slist_copy (hicolor_kde_48));
|
||
|
|
list = g_slist_concat (list,
|
||
|
|
g_slist_copy (hicolor_kde_16));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_48));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_32));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_16));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_22));
|
||
|
|
+
|
||
|
|
} else {
|
||
|
|
/* 1-16 */
|
||
|
|
list = g_slist_concat (g_slist_copy (hicolor_kde_16),
|
||
|
|
@@ -2447,6 +2483,15 @@
|
||
|
|
g_slist_copy (hicolor_kde_32));
|
||
|
|
list = g_slist_concat (list,
|
||
|
|
g_slist_copy (hicolor_kde_48));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_48));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_32));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_16));
|
||
|
|
+ list = g_slist_concat (list,
|
||
|
|
+ g_slist_copy (crystalsvg_kde_22));
|
||
|
|
+
|
||
|
|
}
|
||
|
|
|
||
|
|
list = g_slist_append (list, kde_icondir);
|
||
|
|
@@ -2463,7 +2508,7 @@
|
||
|
|
char *try_prefixes[] = {
|
||
|
|
"/usr",
|
||
|
|
"/opt/kde",
|
||
|
|
- "/opt/kde2",
|
||
|
|
+ "/opt/kde3",
|
||
|
|
"/usr/local",
|
||
|
|
"/kde",
|
||
|
|
"/kde2",
|