summaryrefslogtreecommitdiffstats
path: root/tdm
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-10-11 09:49:45 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-10-11 09:49:51 +0200
commitaa0711c1432432f178bfdad487a2aee592fd5a32 (patch)
tree87afd8281c46a846e627013380314303315ad019 /tdm
parent799e7ef14d52df14ee6b9eea204aa186d6da60ae (diff)
downloadtdebase-aa0711c1432432f178bfdad487a2aee592fd5a32.tar.gz
tdebase-aa0711c1432432f178bfdad487a2aee592fd5a32.zip
Add support for XDG_SESSION_DESKTOP and XDG_CURRENT_DESKTOP in TDM
This relates to Bug 2521 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'tdm')
-rw-r--r--tdm/backend/client.c7
-rw-r--r--tdm/kfrontend/sessions/tde.desktop.cmake1
-rw-r--r--tdm/kfrontend/sessions/tde.desktop.in1
3 files changed, 8 insertions, 1 deletions
diff --git a/tdm/backend/client.c b/tdm/backend/client.c
index 2676a5d2..5a699738 100644
--- a/tdm/backend/client.c
+++ b/tdm/backend/client.c
@@ -1222,7 +1222,7 @@ int
StartClient()
#endif
{
- const char *home, *sessargs, *desksess;
+ const char *home, *sessargs, *desksess, *deskname;
char **env, *xma;
char **argv, *fname, *str;
#ifdef USE_PAM
@@ -1681,6 +1681,7 @@ StartClient()
GSendStr( desksess );
close( mstrtalk.pipe->wfd );
userEnviron = setEnv( userEnviron, "DESKTOP_SESSION", desksess );
+ userEnviron = setEnv( userEnviron, "XDG_SESSION_DESKTOP", desksess );
for (i = 0; td->sessionsDirs[i]; i++) {
fname = 0;
if (StrApp( &fname, td->sessionsDirs[i], "/", desksess, ".desktop", (char *)0 )) {
@@ -1688,6 +1689,10 @@ StartClient()
if (!StrCmp( iniEntry( str, "Desktop Entry", "Hidden", 0 ), "true" ) ||
!(sessargs = iniEntry( str, "Desktop Entry", "Exec", 0 )))
sessargs = "";
+ deskname = iniEntry( str, "Desktop Entry", "DesktopNames", 0 );
+ if (deskname) {
+ userEnviron = setEnv( userEnviron, "XDG_CURRENT_DESKTOP", deskname );
+ }
free( str );
free( fname );
goto gotit;
diff --git a/tdm/kfrontend/sessions/tde.desktop.cmake b/tdm/kfrontend/sessions/tde.desktop.cmake
index c23a3320..8eb5ede8 100644
--- a/tdm/kfrontend/sessions/tde.desktop.cmake
+++ b/tdm/kfrontend/sessions/tde.desktop.cmake
@@ -3,6 +3,7 @@ Encoding=UTF-8
Type=XSession
Exec=@TDE_BIN_DIR@/starttde
TryExec=@TDE_BIN_DIR@/starttde
+DesktopNames=Trinity
Name=TDE
Name[hi]=केडीई
Name[mn]=КДЭ
diff --git a/tdm/kfrontend/sessions/tde.desktop.in b/tdm/kfrontend/sessions/tde.desktop.in
index b9472453..fd1e972b 100644
--- a/tdm/kfrontend/sessions/tde.desktop.in
+++ b/tdm/kfrontend/sessions/tde.desktop.in
@@ -3,6 +3,7 @@ Encoding=UTF-8
Type=XSession
Exec=@TDE_BINDIR@/starttde
TryExec=@TDE_BINDIR@/starttde
+DesktopNames=Trinity
Name=Trinity
Name[hi]=केडीई
Name[mn]=КДЭ