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 | |
| 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')
| -rw-r--r-- | scp2/InstallModule_gnome.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallScript_setup_osl.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 2 | ||||
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 686f6c16cb94..a2d1c88bee4d 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -13,7 +13,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome)) $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ ENABLE_GIO \ - ENABLE_LOCKDOWN \ ENABLE_GTK \ )) diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index 68acb561ef68..593b1afb3c1d 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -33,7 +33,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ $(if $(WITH_EXTENSION_INTEGRATION),\ scp2/extensions \ ) \ - $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ + $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ scp2/gnome \ ) \ $(if $(filter TRUE,$(ENABLE_KDE4)),\ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index c577a10ba379..5acaa0c9ab01 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_winexplorerext \ ) \ ) \ - $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ + $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ InstallModule_gnome \ ) \ $(if $(filter TRUE,$(ENABLE_KDE4)),\ 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); |