diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 12:15:55 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 13:50:28 +0000 |
| commit | 3cf557c12d27f1b2250e69a543136da098112d80 (patch) | |
| tree | a4b988a42e3cef7a019f118914572063c0f73d37 /scp2/source | |
| parent | e00697d9738196f11f331335b256d7bacc17277d (diff) | |
drop gconf integration as per ESC decision
Conflicts:
shell/source/backends/gconfbe/gconfbackend.cxx
Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index c7a13c83dc9d..f64ad4220b6d 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -17,7 +17,7 @@ */ #include "macros.inc" -#if (defined ENABLE_GCONF && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO +#if defined ENABLE_GIO File gid_File_Share_Registry_Gnome_Xcd TXT_FILE_BODY; Styles = (PACKED); |