1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
$NetBSD: patch-an,v 1.7 2005/03/06 12:48:09 markd Exp $
--- kdecore/kstandarddirs.cpp.orig 2004-10-03 20:40:15.000000000 +1300
+++ kdecore/kstandarddirs.cpp
@@ -920,33 +920,33 @@ static int tokenize( QStringList& tokens
QString KStandardDirs::kde_default(const char *type) {
if (!strcmp(type, "data"))
- return "share/apps/";
+ return "share/kde/apps/";
if (!strcmp(type, "html"))
- return "share/doc/HTML/";
+ return "share/doc/kde/HTML/";
if (!strcmp(type, "icon"))
- return "share/icons/";
+ return "share/kde/icons/";
if (!strcmp(type, "config"))
- return "share/config/";
+ return "share/kde/config/";
if (!strcmp(type, "pixmap"))
- return "share/pixmaps/";
+ return "share/kde/pixmaps/";
if (!strcmp(type, "apps"))
- return "share/applnk/";
+ return "share/kde/applnk/";
if (!strcmp(type, "sound"))
- return "share/sounds/";
+ return "share/kde/sounds/";
if (!strcmp(type, "locale"))
- return "share/locale/";
+ return "@PKGLOCALEDIR@/locale/";
if (!strcmp(type, "services"))
- return "share/services/";
+ return "share/kde/services/";
if (!strcmp(type, "servicetypes"))
- return "share/servicetypes/";
+ return "share/kde/servicetypes/";
if (!strcmp(type, "mime"))
- return "share/mimelnk/";
+ return "share/kde/mimelnk/";
if (!strcmp(type, "cgi"))
- return "cgi-bin/";
+ return "kde-cgi-bin/";
if (!strcmp(type, "wallpaper"))
- return "share/wallpapers/";
+ return "share/kde/wallpapers/";
if (!strcmp(type, "templates"))
- return "share/templates/";
+ return "share/kde/templates/";
if (!strcmp(type, "exe"))
return "bin/";
if (!strcmp(type, "lib"))
@@ -962,7 +962,7 @@ QString KStandardDirs::kde_default(const
if (!strcmp(type, "xdgconf-menu"))
return "menus/";
if (!strcmp(type, "kcfg"))
- return "share/config.kcfg";
+ return "share/kde/config.kcfg";
qFatal("unknown resource type %s", type);
return QString::null;
}
@@ -1232,6 +1232,7 @@ void KStandardDirs::addKDEDefaults()
}
xdgdirList.append("/usr/local/share/");
+ xdgdirList.append(KDEDIR "/share/");
xdgdirList.append("/usr/share/");
}
@@ -1402,7 +1403,7 @@ bool KStandardDirs::addCustomized(KConfi
for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++)
{
addPrefix(*it, priority);
- addXdgConfigPrefix(*it+"/etc/xdg", priority);
+ addXdgConfigPrefix(*it+"/xdg", priority);
addXdgDataPrefix(*it+"/share", priority);
}
// If there are no prefixes defined, check if there is a directory
@@ -1411,7 +1412,7 @@ bool KStandardDirs::addCustomized(KConfi
{
QString dir = profileDirsPrefix + profile;
addPrefix(dir, priority);
- addXdgConfigPrefix(dir+"/etc/xdg", priority);
+ addXdgConfigPrefix(dir+"/xdg", priority);
addXdgDataPrefix(dir+"/share", priority);
}
|
