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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index cbfc4ed690b2..af7ee26e21e3 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -293,6 +293,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) if (!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("backtrace")) && !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("strace")) && !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("valgrind")) && + // for X Session Management, handled in + // vcl/unx/generic/app/sm.cxx: + !oArg.match("session=") && //ignore additional legacy options that don't do anything anymore !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("nocrashreport"))) { |