diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 09:47:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 12:16:57 +0100 |
| commit | 5a44320a4d8c7893f596ba2ad1ef2db33fdc8b5c (patch) | |
| tree | 2f0d98f746276c9847ee40a105f87363cd319470 /shell/source | |
| parent | 526f80404c87a41fe46cf5694b32b469875e5c6d (diff) | |
Related: fdo#30763 always fill in default name under GNOME
regardless of whether lockdown is in effect.
Change-Id: I3c5d3aba89f8cedb6e3e4bd2ecc1af954a953306
Diffstat (limited to 'shell/source')
| -rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 3 | ||||
| -rw-r--r-- | shell/source/backends/gconfbe/gconfaccess.cxx | 32 |
2 files changed, 18 insertions, 17 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 9b859c98b2d9..e84e09639edd 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -173,7 +173,7 @@ css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName) || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName" || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort" || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy" - || PropertyName == "ooInetProxyType" ) + || PropertyName == "ooInetProxyType" || PropertyName == "givenname" || PropertyName == "sn" ) { return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); } @@ -214,6 +214,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= desktop; } + // Fall back to the default if the specific backend is not available: css::uno::Reference< css::uno::XInterface > backend; if ( desktop == "GNOME" ) { diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 47d4138d62f4..8743bcd55037 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -568,6 +568,22 @@ ConfigurationValue const ConfigurationValues[] = SETTING_WORK_DIRECTORY, // so that the existence of the dir can be checked }, + { + SETTING_USER_GIVENNAME, + "/desktop/gnome/url-handlers/mailto/command", // dummy + RTL_CONSTASCII_STRINGPARAM("givenname"), + sal_True, + SETTING_USER_GIVENNAME + }, + + { + SETTING_USER_SURNAME, + "/desktop/gnome/url-handlers/mailto/command", // dummy + RTL_CONSTASCII_STRINGPARAM("sn"), + sal_True, + SETTING_USER_SURNAME + }, + #ifdef ENABLE_LOCKDOWN { SETTING_WRITER_DEFAULT_DOC_FORMAT, @@ -610,22 +626,6 @@ ConfigurationValue const ConfigurationValues[] = }, { - SETTING_USER_GIVENNAME, - "/desktop/gnome/url-handlers/mailto/command", // dummy - RTL_CONSTASCII_STRINGPARAM("givenname"), - sal_True, - SETTING_USER_GIVENNAME - }, - - { - SETTING_USER_SURNAME, - "/desktop/gnome/url-handlers/mailto/command", // dummy - RTL_CONSTASCII_STRINGPARAM("sn"), - sal_True, - SETTING_USER_SURNAME - }, - - { SETTING_DISABLE_PRINTING, "/desktop/gnome/lockdown/disable_printing", RTL_CONSTASCII_STRINGPARAM("DisablePrinting"), |