Changeset View
Changeset View
Standalone View
Standalone View
startkde/startplasma.cpp
| Show First 20 Lines • Show All 186 Lines • ▼ Show 20 Line(s) | 176 | { | |||
|---|---|---|---|---|---|
| 187 | 187 | | |||
| 188 | // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. | 188 | // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. | ||
| 189 | // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend | 189 | // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend | ||
| 190 | // to set it to a list of paths *not* including the KDE prefix if it's not /usr or | 190 | // to set it to a list of paths *not* including the KDE prefix if it's not /usr or | ||
| 191 | // /usr/local. | 191 | // /usr/local. | ||
| 192 | if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) { | 192 | if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) { | ||
| 193 | qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share"); | 193 | qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share"); | ||
| 194 | } | 194 | } | ||
| 195 | // Additionally also set default value for XDG_CONFIG_DIRS which is not set by default on FreeBSD. | ||||
dfaure: I see nothing FreeBSD specific about this, I suggest simplifying the comment. | |||||
| 196 | if (!qEnvironmentVariableIsSet("XDG_CONFIG_DIRS")) { | ||||
| 197 | qputenv("XDG_CONFIG_DIRS", KDE_INSTALL_FULL_CONFDIR ":/etc/xdg:/usr/local/etc/xdg"); | ||||
Wait, where does /usr/local/etc/xdg come from? https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html says the default is only /etc/xdg. dfaure: Wait, where does /usr/local/etc/xdg come from? https://specifications.freedesktop.org/basedir… | |||||
On FreeBSD (other BSD's, too), /etc is for the base system only, and all user-add-ons go in *$LOCALBASE*, usually /usr/local .. so XDG stuff, which is a user-add-on, goes into /usr/local/etc. Even our /etc/os-release is in /usr/local/etc/os-release (and Frameworks are suitably patched for that). Some BSD derivatives are less dogmatic about /etc, but not us. adridg: On FreeBSD (other BSD's, too), `/etc` is for the **base** system only, and all user-add-ons go… | |||||
| 198 | } | ||||
| 195 | } | 199 | } | ||
| 196 | 200 | | |||
| 197 | 201 | | |||
| 198 | // Mark that full KDE session is running (e.g. Konqueror preloading works only | 202 | // Mark that full KDE session is running (e.g. Konqueror preloading works only | ||
| 199 | // with full KDE running). The KDE_FULL_SESSION property can be detected by | 203 | // with full KDE running). The KDE_FULL_SESSION property can be detected by | ||
| 200 | // any X client connected to the same X session, even if not launched | 204 | // any X client connected to the same X session, even if not launched | ||
| 201 | // directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION | 205 | // directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION | ||
| 202 | // however guarantees that the application is launched in the same environment | 206 | // however guarantees that the application is launched in the same environment | ||
| ▲ Show 20 Lines • Show All 203 Lines • Show Last 20 Lines | |||||
I see nothing FreeBSD specific about this, I suggest simplifying the comment.