diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-21 13:20:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-22 12:16:11 +0200 |
| commit | 83422f88d79272e6429e148b7d383b3fc84be443 (patch) | |
| tree | 00910575952dc97d338ee9bd4a7114db502c6957 /vcl | |
| parent | c1ee18d5dfb92a9ffb0f8f5f069b8de936c75562 (diff) | |
Fix X Session Management support
...passing -session= into soffice was no longer supported.
The way I tested this with Gnome 3.4 (Fedora 17) is with:
* Run gnome-session-properties to select "Options - Automatically remember
running applications when logging out"
* Create ~/.local/share/applications/lodev.desktop:
[Desktop Entry]
Exec=.../core/solver/unxlngx6/installation/opt/program/soffice
Icon=libreoffice-startcenter
Name=LOdev
Type=Application
* Run "startx /usr/bin/gnome-session -- /usr/bin/Xephyr :1"
Change-Id: Id8a6e431e4c355caafa6c7111a435ebc0d35f78a
(cherry picked from commit 0f12c5de67869593cfbc36760957467a122bf81a)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/app/sm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 82fd4b141ef1..af07f3c14d04 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -202,11 +202,11 @@ static void BuildSmPropertyList() pSmProps[ 2 ].vals[0].length = aExec.getLength()+1; pSmProps[ 2 ].vals[0].value = strdup( aExec.getStr() ); rtl::OStringBuffer aRestartOption; - aRestartOption.append(RTL_CONSTASCII_STRINGPARAM("-session=")); + aRestartOption.append(RTL_CONSTASCII_STRINGPARAM("--session=")); aRestartOption.append(SessionManagerClient::getSessionID()); pSmProps[ 2 ].vals[1].length = aRestartOption.getLength()+1; pSmProps[ 2 ].vals[1].value = strdup(aRestartOption.getStr()); - rtl::OString aRestartOptionNoLogo(RTL_CONSTASCII_STRINGPARAM("-nologo")); + rtl::OString aRestartOptionNoLogo(RTL_CONSTASCII_STRINGPARAM("--nologo")); pSmProps[ 2 ].vals[2].length = aRestartOptionNoLogo.getLength()+1; pSmProps[ 2 ].vals[2].value = strdup(aRestartOptionNoLogo.getStr()); @@ -553,10 +553,10 @@ const rtl::OString& SessionManagerClient::getPreviousSessionID() { ::rtl::OUString aArg; osl_getCommandArg( i, &aArg.pData ); - if(aArg.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("-session="))) + if(aArg.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("--session="))) { aPrevId = rtl::OUStringToOString( - aArg.copy(RTL_CONSTASCII_LENGTH("-session=")), + aArg.copy(RTL_CONSTASCII_LENGTH("--session=")), osl_getThreadTextEncoding()); break; } |