Merge lp:~3v1n0/compiz/drop-gconf into lp:compiz/0.9.12

[Marco Trevisan (Treviño)]

backends: drop gconf support

[Sebastien Bacher (seb128)]

Yes!!!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3990
http://jenkins.qa.ubuntu.com/job/compiz-ci/111/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-xenial-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-xenial-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-xenial-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/111/rebuild

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/compiz/drop-gconf]

3990. By Marco Trevisan (Treviño) on 2015-12-10

backends: drop gconf support

[Alberts Muktupāvels (muktupavels)]

Why focus_mode was changed to focumode?

[lp:~3v1n0/compiz/drop-gconf]

3991. By Marco Trevisan (Treviño) on 2015-12-11

Gnome integration constants, fix typo in focus_mode

[Marco Trevisan (Treviño) (3v1n0)]

Good catch, fixed.

Thanks

=== modified file 'cmake/CMakeLists.txt'
--- cmake/CMakeLists.txt	2012-07-30 06:17:35 +0000
+++ cmake/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -20,11 +20,6 @@
 list (APPEND _PluginExtensionFiles
       plugin_extensions/CompizOpenGLFixups.cmake)
 
-if (USE_GCONF)
-    list (APPEND _files CompizGconf.cmake)
-    list (APPEND _PluginExtensionFiles plugin_extensions/CompizGenGconf.cmake)
-endif (USE_GCONF)
-
 if (USE_GSETTINGS)
     list (APPEND _files CompizGSettings.cmake)
     list (APPEND _PluginExtensionFiles plugin_extensions/CompizGenGSettings.cmake)

=== modified file 'cmake/CompizDefaults.cmake'
--- cmake/CompizDefaults.cmake	2012-01-23 10:38:32 +0000
+++ cmake/CompizDefaults.cmake	2015-12-11 09:51:42 +0000
@@ -8,8 +8,6 @@
 
 set (COMPIZ_BCOP_XSLT ${CMAKE_SOURCE_DIR}/xslt/bcop.xslt)
 
-set (COMPIZ_GCONF_SCHEMAS_SUPPORT ${USE_GCONF})
-set (COMPIZ_GCONF_SCHEMAS_XSLT ${CMAKE_SOURCE_DIR}/xslt/compiz_gconf_schemas.xslt)
 set (COMPIZ_GSETTINGS_SCHEMAS_XSLT ${CMAKE_BINARY_DIR}/xslt/compiz_gsettings_schemas.xslt)
 
 set (COMPIZ_PLUGIN_INSTALL_TYPE "package")

=== modified file 'cmake/CompizDefaults.cmake.in'
--- cmake/CompizDefaults.cmake.in	2011-07-27 16:13:28 +0000
+++ cmake/CompizDefaults.cmake.in	2015-12-11 09:51:42 +0000
@@ -1,6 +1,2 @@
-
 set (COMPIZ_BCOP_XSLT @CMAKE_INSTALL_PREFIX@/share/compiz/xslt/bcop.xslt)
-
-set (COMPIZ_GCONF_SCHEMAS_SUPPORT @USE_GCONF@)
-set (COMPIZ_GCONF_SCHEMAS_XSLT @CMAKE_INSTALL_PREFIX@/share/compiz/xslt/compiz_gconf_schemas.xslt)
-set (COMPIZ_GSETTINGS_SCHEMAS_XSLT @CMAKE_INSTALL_PREFIX@/share/compiz/xslt/compiz_gsettings_schemas.xslt)
\ No newline at end of file
+set (COMPIZ_GSETTINGS_SCHEMAS_XSLT @CMAKE_INSTALL_PREFIX@/share/compiz/xslt/compiz_gsettings_schemas.xslt)

=== removed file 'cmake/CompizGconf.cmake'
--- cmake/CompizGconf.cmake	2012-05-24 00:55:17 +0000
+++ cmake/CompizGconf.cmake	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-option (
-    COMPIZ_DISABLE_SCHEMAS_INSTALL
-    "Disables gconf schema installation with gconftool"
-    OFF
-)
-
-set (
-    COMPIZ_INSTALL_GCONF_SCHEMA_DIR ${COMPIZ_INSTALL_GCONF_SCHEMA_DIR} CACHE PATH
-    "Installation path of the gconf schema file"
-)
-
-function (compiz_install_gconf_schema _src _dst)
-    find_program (GCONFTOOL_EXECUTABLE gconftool-2)
-    mark_as_advanced (FORCE GCONFTOOL_EXECUTABLE)
-
-    if (GCONFTOOL_EXECUTABLE AND NOT COMPIZ_DISABLE_SCHEMAS_INSTALL)
-	install (CODE "
-		if (\"\$ENV{USER}\" STREQUAL \"root\")
-		    exec_program (${GCONFTOOL_EXECUTABLE}
-			ARGS \"--get-default-source\"
-			OUTPUT_VARIABLE ENV{GCONF_CONFIG_SOURCE})
-		    exec_program (${GCONFTOOL_EXECUTABLE}
-			ARGS \"--makefile-install-rule ${_src} > /dev/null\")
-		else (\"\$ENV{USER}\" STREQUAL \"root\")
-		    exec_program (${GCONFTOOL_EXECUTABLE}
-			ARGS \"--install-schema-file=${_src} > /dev/null\")
-		endif (\"\$ENV{USER}\" STREQUAL \"root\")
-		")
-    endif ()
-    install (
-	FILES "${_src}"
-	DESTINATION "${_dst}"
-    )
-endfunction ()
-
-# generate gconf schema
-function (compiz_gconf_schema _src _dst _inst)
-    find_program (XSLTPROC_EXECUTABLE xsltproc)
-    mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
-
-    if (XSLTPROC_EXECUTABLE)
-	add_custom_command (
-	    OUTPUT ${_dst}
-	    COMMAND ${XSLTPROC_EXECUTABLE}
-		    -o ${_dst}
-		    ${COMPIZ_GCONF_SCHEMAS_XSLT}
-		    ${_src}
-	    DEPENDS ${_src}
-	)
-	compiz_install_gconf_schema (${_dst} ${_inst})
-    endif ()
-endfunction ()

=== modified file 'cmake/CompizPlugin.cmake'
--- cmake/CompizPlugin.cmake	2013-02-20 10:53:57 +0000
+++ cmake/CompizPlugin.cmake	2015-12-11 09:51:42 +0000
@@ -50,9 +50,6 @@
 #
 # COMPIZ_I18N_DIR      = Translation file directory
 #
-# COMPIZ_DISABLE_SCHEMAS_INSTALL  = Disables gconf schema installation with gconftool
-# COMPIZ_INSTALL_GCONF_SCHEMA_DIR = Installation path of the gconf schema file
-#
 # VERSION = package version that is added to a plugin pkg-version file
 #
 #######################################################################

=== modified file 'cmake/base.cmake'
--- cmake/base.cmake	2012-12-06 02:44:21 +0000
+++ cmake/base.cmake	2015-12-11 09:51:42 +0000
@@ -1,25 +1,3 @@
-set (USE_GCONF 1 CACHE BOOL "Install core GConf schemas")
-
-if (USE_GCONF)
-    pkg_check_modules (GCONF gconf-2.0)
-
-    find_program (GCONFTOOL_EXECUTABLE gconftool-2)
-    mark_as_advanced (FORCE GCONFTOOL_EXECUTABLE)
-
-    if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-        set (SCHEMADIR "${CMAKE_INSTALL_PREFIX}/share/gconf/schemas")
-    else (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-        set (SCHEMADIR "${COMPIZ_INSTALL_GCONF_SCHEMA_DIR}")
-    endif (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-
-    if (NOT GCONF_FOUND OR NOT GCONFTOOL_EXECUTABLE)
-	set (USE_GCONF 0)
-    else ()
-        include (CompizGconf)
-	include (CompizGSettings)
-    endif ()
-endif ()
-
 function (_print_configure_results)
     compiz_print_configure_header ("Compiz")
     compiz_color_message ("\n${_escape}[4mOptional features:${_escape}[0m\n")
@@ -27,7 +5,6 @@
     compiz_print_result_message ("GLESv2" USE_GLES)
     compiz_print_result_message ("gtk window decorator" USE_GTK)
     compiz_print_result_message ("metacity theme support" USE_METACITY)
-    compiz_print_result_message ("gconf schemas" USE_GCONF)
     compiz_print_result_message ("gnome" USE_GNOME)
     compiz_print_result_message ("kde4 window decorator" USE_KDE4)
 

=== removed file 'cmake/plugin_extensions/CompizGenGconf.cmake'
--- cmake/plugin_extensions/CompizGenGconf.cmake	2013-02-20 13:55:12 +0000
+++ cmake/plugin_extensions/CompizGenGconf.cmake	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-option (
-    COMPIZ_DISABLE_SCHEMAS_INSTALL
-    "Disables gconf schema installation with gconftool"
-    OFF
-)
-
-set (
-    COMPIZ_INSTALL_GCONF_SCHEMA_DIR ${COMPIZ_INSTALL_GCONF_SCHEMA_DIR} CACHE PATH
-    "Installation path of the gconf schema file"
-)
-
-macro (compiz_gconf_prepare_install_dirs)
-    if ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
-	if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-            set (PLUGIN_SCHEMADIR "${datadir}/gconf/schemas")
-        else (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GCONF_SCHEMA_DIR}")
-	endif (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-    elseif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
-	    "$ENV{BUILD_GLOBAL}" STREQUAL "true")
-	if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-            set (PLUGIN_SCHEMADIR "${COMPIZ_PREFIX}/share/gconf/schemas")
-        else (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GCONF_SCHEMA_DIR}")
-	endif (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-    else ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
-	  "$ENV{BUILD_GLOBAL}" STREQUAL "true")
-
-	if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-            set (PLUGIN_SCHEMADIR "$ENV{HOME}/.gconf/schemas")
-        else (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GCONF_SCHEMA_DIR}")
-	endif (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-
-    endif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
-endmacro (compiz_gconf_prepare_install_dirs)
-
-function (compiz_install_gconf_schema _src _dst)
-    find_program (GCONFTOOL_EXECUTABLE gconftool-2)
-    mark_as_advanced (FORCE GCONFTOOL_EXECUTABLE)
-
-    if (GCONFTOOL_EXECUTABLE AND NOT COMPIZ_DISABLE_SCHEMAS_INSTALL)
-	install (CODE "
-		if (\"\$ENV{USER}\" STREQUAL \"root\")
-		    exec_program (${GCONFTOOL_EXECUTABLE}
-			ARGS \"--get-default-source\"
-			OUTPUT_VARIABLE ENV{GCONF_CONFIG_SOURCE})
-		    exec_program (${GCONFTOOL_EXECUTABLE}
-			ARGS \"--makefile-install-rule ${_src} > /dev/null\")
-		else (\"\$ENV{USER}\" STREQUAL \"root\")
-		    exec_program (${GCONFTOOL_EXECUTABLE}
-			ARGS \"--install-schema-file=${_src} > /dev/null\")
-		endif (\"\$ENV{USER}\" STREQUAL \"root\")
-		")
-    endif ()
-    install (
-	FILES "${_src}"
-	DESTINATION "${_dst}"
-    )
-endfunction ()
-
-# generate gconf schema
-find_program (XSLTPROC_EXECUTABLE xsltproc)
-mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
-
-if (XSLTPROC_EXECUTABLE)
-    compiz_gconf_prepare_install_dirs ()
-    add_custom_command (
-	OUTPUT "${CMAKE_BINARY_DIR}/generated/compiz-${COMPIZ_CURRENT_PLUGIN}.schemas"
-	COMMAND ${XSLTPROC_EXECUTABLE}
-		-o "${CMAKE_BINARY_DIR}/generated/compiz-${COMPIZ_CURRENT_PLUGIN}.schemas"
-		${COMPIZ_GCONF_SCHEMAS_XSLT}
-		${COMPIZ_CURRENT_XML_FILE}
-	DEPENDS ${COMPIZ_CURRENT_XML_FILE}
-    )
-
-    if (_install_plugin_${COMPIZ_CURRENT_PLUGIN})
-        compiz_install_gconf_schema ("${CMAKE_BINARY_DIR}/generated/compiz-${COMPIZ_CURRENT_PLUGIN}.schemas" ${PLUGIN_SCHEMADIR})
-    endif (_install_plugin_${COMPIZ_CURRENT_PLUGIN})
-    list (APPEND COMPIZ_CURRENT_SOURCES_ADDS ${CMAKE_BINARY_DIR}/generated/compiz-${COMPIZ_CURRENT_PLUGIN}.schemas)
-endif ()

=== modified file 'compizconfig/CMakeLists.txt'
--- compizconfig/CMakeLists.txt	2015-07-30 19:36:21 +0000
+++ compizconfig/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -16,17 +16,11 @@
     set (libcompizconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
 endif (COMPIZ_PACKAGING_ENABLED)
 
-option (USE_GCONF "Enable legacy GNOME 2.x option integration with GConf" ON)
-
 add_subdirectory (libcompizconfig)
 add_subdirectory (compizconfig-python)
 add_subdirectory (integration)
 add_subdirectory (ccsm)
 
-if (USE_GCONF)
-    add_subdirectory (gconf)
-endif (USE_GCONF)
-
 if (USE_GSETTINGS)
     add_subdirectory (gsettings)
 endif (USE_GSETTINGS)

=== removed directory 'compizconfig/gconf'
=== removed file 'compizconfig/gconf/CMakeLists.txt'
--- compizconfig/gconf/CMakeLists.txt	2012-08-18 12:45:21 +0000
+++ compizconfig/gconf/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-if (USE_GCONF)
-
-    find_package (CompizConfig REQUIRED)
-
-    include (LibCompizConfigCommon)
-
-    include_directories (${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/include
-			 ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/gconf/include)
-    link_directories (${CMAKE_BINARY_DIR}/compizconfig/integration/gnome
-		      ${CMAKE_BINARY_DIR}/compizconfig/integration/gnome/gconf)
-
-    compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0 LIBRARIES
-							   compizconfig_gnome_integration
-							   compizconfig_gnome_integration_gconf_setting_factory
-							   compizconfig_gnome_integration_gconf_integrated_setting)
-endif (USE_GCONF)

=== removed file 'compizconfig/gconf/COPYING'
--- compizconfig/gconf/COPYING	2012-05-16 17:41:22 +0000
+++ compizconfig/gconf/COPYING	1970-01-01 00:00:00 +0000
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-

-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-

-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-

-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-

-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

=== removed file 'compizconfig/gconf/INSTALL'
--- compizconfig/gconf/INSTALL	2012-05-16 17:41:22 +0000
+++ compizconfig/gconf/INSTALL	1970-01-01 00:00:00 +0000
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

=== removed file 'compizconfig/gconf/README'
=== removed directory 'compizconfig/gconf/src'
=== removed file 'compizconfig/gconf/src/gconf.c'
--- compizconfig/gconf/src/gconf.c	2013-05-13 13:23:20 +0000
+++ compizconfig/gconf/src/gconf.c	1970-01-01 00:00:00 +0000
@@ -1,1270 +0,0 @@
-/**
- *
- * GConf libccs backend
- *
- * gconf.c
- *
- * Copyright (c) 2007 Danny Baumann <[e-mail]>
- *
- * Parts of this code are taken from libberylsettings 
- * gconf backend, written by:
- *
- * Copyright (c) 2006 Robert Carr <[e-mail]>
- * Copyright (c) 2007 Dennis Kasprzyk <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- **/
-
-#define CCS_LOG_DOMAIN "gconf"
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <malloc.h>
-#include <string.h>
-#include <dirent.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-
-#include <X11/X.h>
-#include <X11/Xlib.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gconf/gconf-value.h>
-
-#include "ccs_gnome_integration.h"
-#include "ccs_gnome_integration_gconf_integrated_setting_factory.h"
-
-#define COMPIZ       "/apps/compiz-1"
-#define COMPIZCONFIG "/apps/compizconfig-1"
-#define PROFILEPATH  COMPIZCONFIG "/profiles"
-#define DEFAULTPROF "Default"
-#define CORE_NAME   "core"
-
-#define BUFSIZE 512
-
-#define KEYNAME(sn)     char keyName[BUFSIZE]; \
-                    snprintf (keyName, BUFSIZE, "screen%i", sn);
-
-#define PATHNAME    char pathName[BUFSIZE]; \
-		    if (!ccsPluginGetName (ccsSettingGetParent (setting)) || \
-			strcmp (ccsPluginGetName (ccsSettingGetParent (setting)), "core") == 0) \
-                        snprintf (pathName, BUFSIZE, \
-				 "%s/general/%s/options/%s", COMPIZ, \
-				 keyName, ccsSettingGetName (setting)); \
-                    else \
-			snprintf(pathName, BUFSIZE, \
-				 "%s/plugins/%s/%s/options/%s", COMPIZ, \
-				 ccsPluginGetName (ccsSettingGetParent (setting)), keyName, ccsSettingGetName (setting));
-
-static GConfClient *client = NULL;
-static GConfEngine *conf = NULL;
-static guint compizNotifyId;
-static char *currentProfile = NULL;
-static CCSGNOMEValueChangeData valueChangeData =
-{
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
-
-/* some forward declarations */
-static Bool readInit (CCSBackend *backend, CCSContext * context);
-static void readSetting (CCSBackend *backend, CCSContext * context, CCSSetting * setting);
-static Bool readOption (CCSSetting * setting);
-static Bool writeInit (CCSBackend *backend, CCSContext * context);
-static void writeIntegratedOption (CCSContext *context, CCSSetting *setting, CCSIntegratedSetting *integrated);
-
-static Bool
-isIntegratedOption (CCSSetting *setting,
-		    CCSIntegratedSetting **integrated)
-{
-    CCSPlugin    *plugin = ccsSettingGetParent (setting);
-    const char   *pluginName = ccsPluginGetName (plugin);
-    const char   *settingName = ccsSettingGetName (setting);
-    CCSIntegratedSetting *tmp = ccsIntegrationGetIntegratedSetting (valueChangeData.integration, pluginName, settingName);
-
-    if (integrated)
-	*integrated = tmp;
-
-    return tmp != NULL;
-}
-
-static void
-updateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
-{
-    CCSIntegratedSetting *integrated;
-    readInit (backend, context);
-    if (!readOption (setting))
-	ccsResetToDefault (setting, TRUE);
-
-    if (ccsGetIntegrationEnabled (context) &&
-	isIntegratedOption (setting, &integrated))
-    {
-	writeInit (backend, context);
-	writeIntegratedOption (context, setting, integrated);
-    }
-}
-
-static void
-valueChanged (GConfClient *client,
-	      guint       cnxn_id,
-	      GConfEntry  *entry,
-	      gpointer    user_data)
-{
-    CCSContext   *context = (CCSContext *)user_data;
-    char         *keyName = (char*) gconf_entry_get_key (entry);
-    char         *pluginName;
-    char         *token;
-    unsigned int screenNum;
-    CCSPlugin    *plugin;
-    CCSSetting   *setting;
-
-    keyName += strlen (COMPIZ) + 1;
-
-    token = strsep (&keyName, "/"); /* plugin */
-    if (!token)
-	return;
-
-    if (strcmp (token, "general") == 0)
-    {
-	pluginName = "core";
-    }
-    else
-    {
-	token = strsep (&keyName, "/");
-	if (!token)
-	    return;
-	pluginName = token;
-    }
-
-    plugin = ccsFindPlugin (context, pluginName);
-    if (!plugin)
-	return;
-
-    token = strsep (&keyName, "/");
-    if (!token)
-	return;
-
-    sscanf (token, "screen%d", &screenNum);
-
-    token = strsep (&keyName, "/"); /* 'options' */
-    if (!token)
-	return;
-
-    token = strsep (&keyName, "/");
-    if (!token)
-	return;
-
-    setting = ccsFindSetting (plugin, token);
-    if (!setting)
-	return;
-
-    /* Passing null here is not optimal, but we are not
-     * maintaining gconf actively here */
-    updateSetting (NULL, context, plugin, setting);
-}
-
-static void
-initClient (CCSBackend *backend, CCSContext *context)
-{
-    client = gconf_client_get_for_engine (conf);
-
-    valueChangeData.context = context;
-    valueChangeData.storage = ccsIntegratedSettingsStorageDefaultImplNew (&ccsDefaultObjectAllocator);
-    valueChangeData.factory = ccsGConfIntegratedSettingFactoryNew (client, &valueChangeData, &ccsDefaultObjectAllocator);
-
-    valueChangeData.integration = ccsGNOMEIntegrationBackendNew (backend,
-								 context,
-								 valueChangeData.factory,
-								 valueChangeData.storage,
-								 &ccsDefaultObjectAllocator);
-
-    compizNotifyId = gconf_client_notify_add (client, COMPIZ, valueChanged,
-					      context, NULL, NULL);
-    gconf_client_add_dir (client, COMPIZ, GCONF_CLIENT_PRELOAD_NONE, NULL);
-}
-
-static void
-finiClient (void)
-{
-    ccsIntegrationUnref (valueChangeData.integration);
-
-    if (compizNotifyId)
-    {
-	gconf_client_notify_remove (client, compizNotifyId);
-	compizNotifyId = 0;
-    }
-    gconf_client_remove_dir (client, COMPIZ, NULL);
-    gconf_client_suggest_sync (client, NULL);
-
-    g_object_unref (client);
-    client = NULL;
-
-    memset (&valueChangeData, 0, sizeof (CCSGNOMEValueChangeData));
-}
-
-static void
-copyGconfValues (GConfEngine *conf,
-		 const gchar *from,
-		 const gchar *to,
-		 Bool        associate,
-		 const gchar *schemaPath)
-{
-    GSList *values, *tmp;
-    GError *err = NULL;
-
-    values = gconf_engine_all_entries (conf, from, &err);
-    tmp = values;
-
-    while (tmp)
-    {
-	GConfEntry *entry = tmp->data;
-	const char *key = gconf_entry_get_key (entry);
-	char       *name, *newKey, *newSchema = NULL;
-
-	name = strrchr (key, '/');
-	if (!name)
-	    continue;
-
-	if (to)
-	{
-	    GConfValue *value;
-
-	    if (asprintf (&newKey, "%s/%s", to, name + 1) == -1)
-		newKey = NULL;
-
-	    if (associate && schemaPath)
-		if (asprintf (&newSchema, "%s/%s", schemaPath, name + 1) == -1)
-		    newSchema = NULL;
-
-	    if (newKey && newSchema)
-		gconf_engine_associate_schema (conf, newKey, newSchema, NULL);
-
-	    if (newKey)
-	    {
-		value = gconf_engine_get_without_default (conf, key, NULL);
-		if (value)
-		{
-		    gconf_engine_set (conf, newKey, value, NULL);
-		    gconf_value_free (value);
-		}
-	    }
-
-	    if (newSchema)
-		free (newSchema);
-	    if (newKey)
-		free (newKey);
-	}
-	else
-	{
-	    if (associate)
-		gconf_engine_associate_schema (conf, key, NULL, NULL);
-	    gconf_engine_unset (conf, key, NULL);
-	}
-
-	gconf_entry_unref (entry);
-	tmp = g_slist_next (tmp);
-    }
-
-    if (values)
-	g_slist_free (values);
-}
-
-static void
-copyGconfRecursively (GConfEngine *conf,
-		      GSList      *subdirs,
-		      const gchar *to,
-		      Bool        associate,
-		      const gchar *schemaPath)
-{
-    GSList* tmp;
-
-    tmp = subdirs;
-
-    while (tmp)
-    {
- 	gchar *path = tmp->data;
-	char  *newKey, *newSchema = NULL, *name;
-
-	name = strrchr (path, '/');
-	if (name)
-	{
-	    if (!(to && asprintf (&newKey, "%s/%s", to, name + 1) != -1))
-		newKey = NULL;
-
-	    if (associate && schemaPath)
-		if (asprintf (&newSchema, "%s/%s", schemaPath, name + 1) == -1)
-		    newSchema = NULL;
-
-	    copyGconfValues (conf, path, newKey, associate, newSchema);
-	    copyGconfRecursively (conf,
-				  gconf_engine_all_dirs (conf, path, NULL),
-				  newKey, associate, newSchema);
-
-	    if (newSchema)
-		free (newSchema);
-
-	    if (newKey)
-		free (newKey);
-
-	    if (!to)
-		gconf_engine_remove_dir (conf, path, NULL);
-	}
-
-	g_free (path);
-	tmp = g_slist_next (tmp);
-    }
-
-    if (subdirs)
-	g_slist_free (subdirs);
-}
-
-static void
-copyGconfTree (CCSBackend  *backend,
-	       CCSContext  *context,
-	       const gchar *from,
-	       const gchar *to,
-	       Bool        associate,
-	       const gchar *schemaPath)
-{
-    GSList* subdirs;
-
-    /* we aren't allowed to have an open GConfClient object while
-       using GConfEngine, so shut it down and open it again afterwards */
-    finiClient ();
-
-    subdirs = gconf_engine_all_dirs (conf, from, NULL);
-    gconf_engine_suggest_sync (conf, NULL);
-
-    copyGconfRecursively (conf, subdirs, to, associate, schemaPath);
-
-    gconf_engine_suggest_sync (conf, NULL);
-
-    initClient (backend, context);
-}
-
-static Bool
-readListValue (CCSSetting *setting,
-	       GConfValue *gconfValue)
-{
-    GConfValueType      valueType;
-    unsigned int        nItems, i = 0;
-    CCSSettingValueList list = NULL;
-    GSList              *valueList = NULL;
-
-    switch (ccsSettingGetInfo (setting)->forList.listType)
-    {
-    case TypeString:
-    case TypeMatch:
-    case TypeColor:
-	valueType = GCONF_VALUE_STRING;
-	break;
-    case TypeBool:
-	valueType = GCONF_VALUE_BOOL;
-	break;
-    case TypeInt:
-	valueType = GCONF_VALUE_INT;
-	break;
-    case TypeFloat:
-	valueType = GCONF_VALUE_FLOAT;
-	break;
-    default:
-	valueType = GCONF_VALUE_INVALID;
-	break;
-    }
-
-    if (valueType == GCONF_VALUE_INVALID)
-	return FALSE;
-
-    if (valueType != gconf_value_get_list_type (gconfValue))
-	return FALSE;
-
-    valueList = gconf_value_get_list (gconfValue);
-    if (!valueList)
-    {
-	ccsSetList (setting, NULL, TRUE);
-	return TRUE;
-    }
-
-    nItems = g_slist_length (valueList);
-
-    switch (ccsSettingGetInfo (setting)->forList.listType)
-    {
-    case TypeBool:
-	{
-	    Bool *array = malloc (nItems * sizeof (Bool));
-	    if (!array)
-		break;
-
-	    for (; valueList; valueList = valueList->next, ++i)
-		array[i] =
-		    gconf_value_get_bool (valueList->data) ? TRUE : FALSE;
-	    list = ccsGetValueListFromBoolArray (array, nItems, setting);
-	    free (array);
-	}
-	break;
-    case TypeInt:
-	{
-	    int *array = malloc (nItems * sizeof (int));
-	    if (!array)
-		break;
-
-	    for (; valueList; valueList = valueList->next, ++i)
-		array[i] = gconf_value_get_int (valueList->data);
-	    list = ccsGetValueListFromIntArray (array, nItems, setting);
-	    free (array);
-	}
-	break;
-    case TypeFloat:
-	{
-	    float *array = malloc (nItems * sizeof (float));
-	    if (!array)
-		break;
-
-	    for (; valueList; valueList = valueList->next, ++i)
-		array[i] = gconf_value_get_float (valueList->data);
-	    list = ccsGetValueListFromFloatArray (array, nItems, setting);
-	    free (array);
-	}
-	break;
-    case TypeString:
-    case TypeMatch:
-	{
-	    gchar **array = malloc ((nItems + 1) * sizeof (char*));
-	    if (!array)
-		break;
-
-	    for (; valueList; valueList = valueList->next, ++i)
-		array[i] = strdup (gconf_value_get_string (valueList->data));
-
-	    array[nItems] = NULL;
-
-	    list = ccsGetValueListFromStringArray ((const char **) array, nItems, setting);
-	    g_strfreev (array);
-	}
-	break;
-    case TypeColor:
-	{
-	    CCSSettingColorValue *array;
-	    array = malloc (nItems * sizeof (CCSSettingColorValue));
-	    if (!array)
-		break;
-
-	    for (; valueList; valueList = valueList->next, ++i)
-    	    {
-		memset (&array[i], 0, sizeof (CCSSettingColorValue));
-		ccsStringToColor (gconf_value_get_string (valueList->data),
-				  &array[i]);
-	    }
-	    list = ccsGetValueListFromColorArray (array, nItems, setting);
-	    free (array);
-	}
-	break;
-    default:
-	break;
-    }
-
-    if (list)
-    {
-	ccsSetList (setting, list, TRUE);
-	ccsSettingValueListFree (list, TRUE);
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
-
-static Bool
-readIntegratedOption (CCSContext *context,
-		      CCSSetting *setting,
-		      CCSIntegratedSetting *integrated)
-{
-    return ccsIntegrationReadOptionIntoSetting (valueChangeData.integration, context, setting, integrated);
-}
-
-static Bool
-readOption (CCSSetting * setting)
-{
-    GConfValue *gconfValue = NULL;
-    GError     *err = NULL;
-    Bool       ret = FALSE;
-    Bool       valid = TRUE;
-
-    KEYNAME (ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
-    PATHNAME;
-
-    /* first check if the key is set */
-    gconfValue = gconf_client_get_without_default (client, pathName, &err);
-    if (err)
-    {
-	g_error_free (err);
-	return FALSE;
-    }
-    if (!gconfValue)
-	/* value is not set */
-	return FALSE;
-
-    /* setting type sanity check */
-    switch (ccsSettingGetType (setting))
-    {
-    case TypeString:
-    case TypeMatch:
-    case TypeColor:
-    case TypeKey:
-    case TypeButton:
-    case TypeEdge:
-	valid = (gconfValue->type == GCONF_VALUE_STRING);
-	break;
-    case TypeInt:
-	valid = (gconfValue->type == GCONF_VALUE_INT);
-	break;
-    case TypeBool:
-    case TypeBell:
-	valid = (gconfValue->type == GCONF_VALUE_BOOL);
-	break;
-    case TypeFloat:
-	valid = (gconfValue->type == GCONF_VALUE_FLOAT);
-	break;
-    case TypeList:
-	valid = (gconfValue->type == GCONF_VALUE_LIST);
-	break;
-    default:
-	break;
-    }
-    if (!valid)
-    {
-	ccsWarning ("There is an unsupported value at path %s. "
-		"Settings from this path won't be read. Try to remove "
-		"that value so that operation can continue properly.",
-		pathName);
-	return FALSE;
-    }
-
-    switch (ccsSettingGetType (setting))
-    {
-    case TypeString:
-	{
-	    const char *value;
-	    value = gconf_value_get_string (gconfValue);
-	    if (value)
-	    {
-		ccsSetString (setting, value, TRUE);
-		ret = TRUE;
-	    }
-	}
-	break;
-    case TypeMatch:
-	{
-	    const char * value;
-	    value = gconf_value_get_string (gconfValue);
-	    if (value)
-	    {
-		ccsSetMatch (setting, value, TRUE);
-		ret = TRUE;
-	    }
-	}
-	break;
-    case TypeInt:
-	{
-	    int value;
-	    value = gconf_value_get_int (gconfValue);
-
-	    ccsSetInt (setting, value, TRUE);
-	    ret = TRUE;
-	}
-	break;
-    case TypeBool:
-	{
-	    gboolean value;
-	    value = gconf_value_get_bool (gconfValue);
-
-	    ccsSetBool (setting, value ? TRUE : FALSE, TRUE);
-	    ret = TRUE;
-	}
-	break;
-    case TypeFloat:
-	{
-	    double value;
-	    value = gconf_value_get_float (gconfValue);
-
-	    ccsSetFloat (setting, (float)value, TRUE);
-    	    ret = TRUE;
-	}
-	break;
-    case TypeColor:
-	{
-	    const char           *value;
-	    CCSSettingColorValue color;
-	    value = gconf_value_get_string (gconfValue);
-
-	    if (value && ccsStringToColor (value, &color))
-	    {
-		ccsSetColor (setting, color, TRUE);
-		ret = TRUE;
-	    }
-	}
-	break;
-    case TypeKey:
-	{
-	    const char         *value;
-	    CCSSettingKeyValue key;
-	    value = gconf_value_get_string (gconfValue);
-
-	    if (value && ccsStringToKeyBinding (value, &key))
-	    {
-		ccsSetKey (setting, key, TRUE);
-		ret = TRUE;
-	    }
-	}
-	break;
-    case TypeButton:
-	{
-	    const char            *value;
-	    CCSSettingButtonValue button;
-	    value = gconf_value_get_string (gconfValue);
-
-	    if (value && ccsStringToButtonBinding (value, &button))
-	    {
-		ccsSetButton (setting, button, TRUE);
-		ret = TRUE;
-	    }
-	}
-	break;
-    case TypeEdge:
-	{
-	    const char   *value;
-	    value = gconf_value_get_string (gconfValue);
-
-	    if (value)
-	    {
-		unsigned int edges;
-		edges = ccsStringToEdges (value);
-		ccsSetEdge (setting, edges, TRUE);
-		ret = TRUE;
-	    }
-	}
-	break;
-    case TypeBell:
-	{
-	    gboolean value;
-	    value = gconf_value_get_bool (gconfValue);
-
-	    ccsSetBell (setting, value ? TRUE : FALSE, TRUE);
-	    ret = TRUE;
-	}
-	break;
-    case TypeList:
-	ret = readListValue (setting, gconfValue);
-	break;
-    default:
-	ccsWarning ("Attempt to read unsupported setting type %d from path %s!",
-	       ccsSettingGetType (setting), pathName);
-	break;
-    }
-
-    if (gconfValue)
-	gconf_value_free (gconfValue);
-
-    return ret;
-}
-
-static void
-writeListValue (CCSSetting *setting,
-		char       *pathName)
-{
-    GSList              *valueList = NULL;
-    GConfValueType      valueType;
-    Bool                freeItems = FALSE;
-    CCSSettingValueList list;
-    gpointer            data;
-
-    if (!ccsGetList (setting, &list))
-	return;
-
-    switch (ccsSettingGetInfo (setting)->forList.listType)
-    {
-    case TypeBool:
-	{
-	    while (list)
-	    {
-		data = GINT_TO_POINTER (list->data->value.asBool);
-		valueList = g_slist_append (valueList, data);
-		list = list->next;
-	    }
-	    valueType = GCONF_VALUE_BOOL;
-	}
-	break;
-    case TypeInt:
-	{
-	    while (list)
-	    {
-		data = GINT_TO_POINTER (list->data->value.asInt);
-		valueList = g_slist_append(valueList, data);
-		list = list->next;
-    	    }
-	    valueType = GCONF_VALUE_INT;
-	}
-	break;
-    case TypeFloat:
-	{
-	    gdouble *item;
-	    while (list)
-	    {
-		item = malloc (sizeof (gdouble));
-		if (item)
-		{
-		    *item = list->data->value.asFloat;
-		    valueList = g_slist_append (valueList, item);
-		}
-		list = list->next;
-	    }
-	    freeItems = TRUE;
-	    valueType = GCONF_VALUE_FLOAT;
-	}
-	break;
-    case TypeString:
-	{
-	    while (list)
-	    {
-		valueList = g_slist_append(valueList,
-		   			   list->data->value.asString);
-		list = list->next;
-	    }
-	    valueType = GCONF_VALUE_STRING;
-	}
-	break;
-    case TypeMatch:
-	{
-	    while (list)
-	    {
-		valueList = g_slist_append(valueList,
-		   			   list->data->value.asMatch);
-		list = list->next;
-	    }
-	    valueType = GCONF_VALUE_STRING;
-	}
-	break;
-    case TypeColor:
-	{
-	    char *item;
-	    while (list)
-	    {
-		item = ccsColorToString (&list->data->value.asColor);
-		valueList = g_slist_append (valueList, item);
-		list = list->next;
-	    }
-	    freeItems = TRUE;
-	    valueType = GCONF_VALUE_STRING;
-	}
-	break;
-    default:
-	ccsWarning ("Attempt to write unsupported list type %d at path %s!",
-	       ccsSettingGetInfo (setting)->forList.listType, pathName);
-	valueType = GCONF_VALUE_INVALID;
-	break;
-    }
-
-    if (valueType != GCONF_VALUE_INVALID)
-    {
-	gconf_client_set_list (client, pathName, valueType, valueList, NULL);
-
-	if (freeItems)
-	{
-	    GSList *tmpList = valueList;
-	    for (; tmpList; tmpList = tmpList->next)
-		if (tmpList->data)
-		    free (tmpList->data);
-	}
-    }
-    if (valueList)
-	g_slist_free (valueList);
-}
-
-static void
-writeIntegratedOption (CCSContext *context,
-		       CCSSetting *setting,
-		       CCSIntegratedSetting *integrated)
-{
-    ccsIntegrationWriteSettingIntoOption (valueChangeData.integration, context, setting, integrated);
-}
-
-static void
-resetOptionToDefault (CCSSetting * setting)
-{
-    KEYNAME (ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
-    PATHNAME;
-
-    gconf_client_recursive_unset (client, pathName, 0, NULL);
-    gconf_client_suggest_sync (client, NULL);
-}
-
-static void
-writeOption (CCSSetting * setting)
-{
-    KEYNAME (ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
-    PATHNAME;
-
-    switch (ccsSettingGetType (setting))
-    {
-    case TypeString:
-	{
-	    const char *value;
-	    if (ccsGetString (setting, &value))
-		gconf_client_set_string (client, pathName, value, NULL);
-	}
-	break;
-    case TypeMatch:
-	{
-	    const char *value;
-	    if (ccsGetMatch (setting, &value))
-		gconf_client_set_string (client, pathName, value, NULL);
-	}
-    case TypeFloat:
-	{
-	    float value;
-	    if (ccsGetFloat (setting, &value))
-		gconf_client_set_float (client, pathName, value, NULL);
-	}
-	break;
-    case TypeInt:
-	{
-	    int value;
-	    if (ccsGetInt (setting, &value))
-		gconf_client_set_int (client, pathName, value, NULL);
-	}
-	break;
-    case TypeBool:
-	{
-	    Bool value;
-	    if (ccsGetBool (setting, &value))
-		gconf_client_set_bool (client, pathName, value, NULL);
-	}
-	break;
-    case TypeColor:
-	{
-	    CCSSettingColorValue value;
-	    char                 *colString;
-
-	    if (!ccsGetColor (setting, &value))
-		break;
-
-	    colString = ccsColorToString (&value);
-	    if (!colString)
-		break;
-
-	    gconf_client_set_string (client, pathName, colString, NULL);
-	    free (colString);
-	}
-	break;
-    case TypeKey:
-	{
-	    CCSSettingKeyValue key;
-	    char               *keyString;
-
-	    if (!ccsGetKey (setting, &key))
-		break;
-
-	    keyString = ccsKeyBindingToString (&key);
-	    if (!keyString)
-		break;
-
-	    gconf_client_set_string (client, pathName, keyString, NULL);
-	    free (keyString);
-	}
-	break;
-    case TypeButton:
-	{
-	    CCSSettingButtonValue button;
-	    char                  *buttonString;
-
-	    if (!ccsGetButton (setting, &button))
-		break;
-
-	    buttonString = ccsButtonBindingToString (&button);
-	    if (!buttonString)
-		break;
-
-	    gconf_client_set_string (client, pathName, buttonString, NULL);
-	    free (buttonString);
-	}
-	break;
-    case TypeEdge:
-	{
-	    unsigned int edges;
-	    char         *edgeString;
-
-	    if (!ccsGetEdge (setting, &edges))
-		break;
-
-	    edgeString = ccsEdgesToString (edges);
-	    if (!edgeString)
-		break;
-
-	    gconf_client_set_string (client, pathName, edgeString, NULL);
-	    free (edgeString);
-	}
-	break;
-    case TypeBell:
-	{
-	    Bool value;
-	    if (ccsGetBell (setting, &value))
-		gconf_client_set_bool (client, pathName, value, NULL);
-	}
-	break;
-    case TypeList:
-	writeListValue (setting, pathName);
-	break;
-    default:
-	ccsWarning ("Attempt to write unsupported setting type %d",
-	       ccsSettingGetType (setting));
-	break;
-    }
-}
-
-static void
-updateCurrentProfileName (char *profile)
-{
-    GConfSchema *schema;
-    GConfValue  *value;
-    
-    schema = gconf_schema_new ();
-    if (!schema)
-	return;
-
-    value = gconf_value_new (GCONF_VALUE_STRING);
-    if (!value)
-    {
-	gconf_schema_free (schema);
-	return;
-    }
-
-    gconf_schema_set_type (schema, GCONF_VALUE_STRING);
-    gconf_schema_set_locale (schema, "C");
-    gconf_schema_set_short_desc (schema, "Current profile");
-    gconf_schema_set_long_desc (schema, "Current profile of gconf backend");
-    gconf_schema_set_owner (schema, "compizconfig-1");
-    gconf_value_set_string (value, profile);
-    gconf_schema_set_default_value (schema, value);
-
-    gconf_client_set_schema (client, COMPIZCONFIG "/current_profile",
-			     schema, NULL);
-
-    gconf_schema_free (schema);
-    gconf_value_free (value);
-}
-
-static char*
-getCurrentProfileName (void)
-{
-    GConfSchema *schema = NULL;
-
-    schema = gconf_client_get_schema (client,
-    				      COMPIZCONFIG "/current_profile", NULL);
-
-    if (schema)
-    {
-	GConfValue *value;
-	char       *ret = NULL;
-
-	value = gconf_schema_get_default_value (schema);
-	if (value)
-	    ret = strdup (gconf_value_get_string (value));
-	gconf_schema_free (schema);
-
-	return ret;
-    }
-
-    return NULL;
-}
-
-static Bool
-checkProfile (CCSBackend *backend,
-	      CCSContext *context)
-{
-    const char *profileCCS;
-    char *lastProfile;
-
-    lastProfile = currentProfile;
-
-    profileCCS = ccsGetProfile (context);
-    if (!profileCCS || !strlen (profileCCS))
-	currentProfile = strdup (DEFAULTPROF);
-    else
-	currentProfile = strdup (profileCCS);
-
-    if (!lastProfile || strcmp (lastProfile, currentProfile) != 0)
-    {
-	char *pathName;
-
-	if (lastProfile)
-	{
-	    /* copy /apps/compiz-1 tree to profile path */
-	    if (asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile) == -1)
-		pathName = NULL;
-
-	    if (pathName)
-	    {
-		copyGconfTree (backend,
-			       context, COMPIZ, pathName,
-			       TRUE, "/schemas" COMPIZ);
-		free (pathName);
-	    }
-	}
-
-	/* reset /apps/compiz-1 tree */
-	gconf_client_recursive_unset (client, COMPIZ, 0, NULL);
-
-	/* copy new profile tree to /apps/compiz-1 */
-	if (asprintf (&pathName, "%s/%s", PROFILEPATH, currentProfile) == -1)
-	    pathName = NULL;
-
-	if (pathName)
-	{
-	    copyGconfTree (backend, context, pathName, COMPIZ, FALSE, NULL);
-
-    	    /* delete the new profile tree in /apps/compizconfig-1
-    	       to avoid user modification in the wrong tree */
-	    copyGconfTree (backend, context, pathName, NULL, TRUE, NULL);
-    	    free (pathName);
-	}
-
-	/* update current profile name */
-	updateCurrentProfileName (currentProfile);
-    }
-
-    if (lastProfile)
-	free (lastProfile);
-
-    return TRUE;
-}
-
-static void
-processEvents (CCSBackend *backend, unsigned int flags)
-{
-    if (!(flags & ProcessEventsNoGlibMainLoopMask))
-    {
-	while (g_main_context_pending(NULL))
-	    g_main_context_iteration(NULL, FALSE);
-    }
-}
-
-static Bool
-initBackend (CCSBackend *backend, CCSContext * context)
-{
-    g_type_init ();
-
-    conf = gconf_engine_get_default ();
-    initClient (backend, context);
-
-    currentProfile = getCurrentProfileName ();
-
-    return TRUE;
-}
-
-static Bool
-finiBackend (CCSBackend *backend)
-{
-    gconf_client_clear_cache (client);
-    finiClient ();
-
-    if (currentProfile)
-    {
-	free (currentProfile);
-	currentProfile = NULL;
-    }
-
-    gconf_engine_unref (conf);
-    conf = NULL;
-
-    return TRUE;
-}
-
-static Bool
-readInit (CCSBackend *backend, CCSContext * context)
-{
-    return checkProfile (backend, context);
-}
-
-static void
-readSetting (CCSBackend *backend,
-	     CCSContext *context,
-	     CCSSetting *setting)
-{
-    Bool status;
-    CCSIntegratedSetting *integrated;
-
-    if (ccsGetIntegrationEnabled (context) &&
-	isIntegratedOption (setting, &integrated))
-    {
-	status = readIntegratedOption (context, setting, integrated);
-    }
-    else
-	status = readOption (setting);
-
-    if (!status)
-	ccsResetToDefault (setting, TRUE);
-}
-
-static Bool
-writeInit (CCSBackend *backend, CCSContext * context)
-{
-    return checkProfile (backend, context);
-}
-
-static void
-writeSetting (CCSBackend *backend,
-	      CCSContext *context,
-	      CCSSetting *setting)
-{
-    CCSIntegratedSetting *integrated;
-
-    if (ccsGetIntegrationEnabled (context) &&
-	isIntegratedOption (setting, &integrated))
-    {
-	writeIntegratedOption (context, setting, integrated);
-    }
-    else if (ccsSettingGetIsDefault (setting))
-    {
-	resetOptionToDefault (setting);
-    }
-    else
-	writeOption (setting);
-
-}
-
-static Bool
-getSettingIsIntegrated (CCSBackend *backend, CCSSetting * setting)
-{
-    if (!ccsGetIntegrationEnabled (ccsPluginGetContext (ccsSettingGetParent (setting))))
-	return FALSE;
-
-    if (!isIntegratedOption (setting, NULL))
-	return FALSE;
-
-    return TRUE;
-}
-
-static Bool
-getSettingIsReadOnly (CCSBackend *backend, CCSSetting * setting)
-{
-    /* FIXME */
-    return FALSE;
-}
-
-static CCSStringList
-getExistingProfiles (CCSBackend *backend, CCSContext *context)
-{
-    GSList        *data, *tmp;
-    CCSStringList ret = NULL;
-    char          *name;
-
-    gconf_client_suggest_sync (client, NULL);
-    data = gconf_client_all_dirs (client, PROFILEPATH, NULL);
-
-    for (tmp = data; tmp; tmp = g_slist_next (tmp))
-    {
-	name = strrchr (tmp->data, '/');
-	if (name && (strcmp (name + 1, DEFAULTPROF) != 0))
-	{
-	    CCSString *str = calloc (1, sizeof (CCSString));
-	    str->value = strdup (name + 1);
-	    ret = ccsStringListAppend (ret, str);
-	}
-
-	g_free (tmp->data);
-    }
-
-    g_slist_free (data);
-
-    name = getCurrentProfileName ();
-    if (name && strcmp (name, DEFAULTPROF) != 0)
-    {
-	CCSString *str = calloc (1, sizeof (CCSString));
-	str->value = name;
-	ret = ccsStringListAppend (ret, str);
-    }
-    else if (name)
-	free (name);
-
-    return ret;
-}
-
-static Bool
-deleteProfile (CCSBackend *backend,
-	       CCSContext *context,
-	       char       *profile)
-{
-    char     path[BUFSIZE];
-    gboolean status = FALSE;
-
-    checkProfile (backend, context);
-
-    snprintf (path, BUFSIZE, "%s/%s", PROFILEPATH, profile);
-
-    if (gconf_client_dir_exists (client, path, NULL))
-    {
-	status =
-	    gconf_client_recursive_unset (client, path,
-	   				  GCONF_UNSET_INCLUDING_SCHEMA_NAMES,
-					  NULL);
-	gconf_client_suggest_sync (client, NULL);
-    }
-
-    return status;
-}
-
-const CCSBackendInfo gconfBackendInfo =
-{
-    "gconf",
-    "GConf Configuration Backend",
-    "GConf Configuration Backend for libccs",
-    TRUE,
-    TRUE,
-    1
-};
-
-static const CCSBackendInfo *
-getInfo (CCSBackend *backend)
-{
-    return &gconfBackendInfo;
-}
-
-static CCSBackendInterface gconfVTable = {
-    getInfo,
-    processEvents,
-    initBackend,
-    finiBackend,
-    readInit,
-    readSetting,
-    0,
-    writeInit,
-    writeSetting,
-    0,
-    updateSetting,
-    getSettingIsIntegrated,
-    getSettingIsReadOnly,
-    getExistingProfiles,
-    deleteProfile
-};
-
-CCSBackendInterface *
-getBackendInfo (void)
-{
-    return &gconfVTable;
-}
-

=== modified file 'compizconfig/gsettings/CMakeLists.txt'
--- compizconfig/gsettings/CMakeLists.txt	2012-10-26 00:31:03 +0000
+++ compizconfig/gsettings/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -8,12 +8,6 @@
 set (_deps glib-2.0>=2.20.0
 	   gio-2.0>=2.25.0)
 
-if (USE_GCONF)
-    list (APPEND _deps gconf-2.0>=2.31.1)
-
-    add_definitions (-DUSE_GCONF)
-endif (USE_GCONF)
-
 if (COMPIZ_BUILD_TESTING)
     add_subdirectory (mocks)
 endif (COMPIZ_BUILD_TESTING)

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt'
--- compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2014-11-25 13:15:56 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -7,7 +7,6 @@
     set (GSETTINGS_UTIL_LIB_INCLUDES
          ${CMAKE_CURRENT_SOURCE_DIR}
          ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/include
-         ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/gconf/include
          ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/gsettings/include
 	 ${compiz_SOURCE_DIR}/compizconfig/libcompizconfig/include
 	 ${GSETTINGS_UTIL_INCLUDE_DIRS}
@@ -18,7 +17,6 @@
     link_directories (${GSETTINGS_UTIL_LIBRARY_DIRS}
 		      ${compiz_BINARY_DIR}/compizconfig/libcompizconfig
                       ${compiz_BINARY_DIR}/compizconfig/integration/gnome
-                      ${CMAKE_BINARY_DIR}/compizconfig/integration/gnome/gconf
                       ${CMAKE_BINARY_DIR}/compizconfig/integration/gnome/gsettings)
 
     add_library (compizconfig_gsettings_backend_interface STATIC
@@ -65,13 +63,6 @@
 	 compizconfig_gsettings_wrapper_factory
 	 compizconfig)
 
-    if (USE_GCONF)
-	list (APPEND GSETTINGS_BACKEND_SHARED_ADDITIONAL_LIBRARIES
-	      compizconfig_gnome_integration_gconf_setting_factory)
-	list (APPEND GSETTINGS_BACKEND_SHARED_ADDITIONAL_LIBRARIES
-	      compizconfig_gnome_integration_gconf_integrated_setting)
-    endif (USE_GCONF)
-
     target_link_libraries (compizconfig_gsettings_backend
 			   ${GSETTINGS_BACKEND_SHARED_ADDITIONAL_LIBRARIES}
                            ${GSETTINGS_UTIL_LIBRARIES})

=== modified file 'compizconfig/integration/gnome/CMakeLists.txt'
--- compizconfig/integration/gnome/CMakeLists.txt	2012-09-25 08:17:14 +0000
+++ compizconfig/integration/gnome/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -1,6 +1,5 @@
 include (FindPkgConfig)
 
-add_subdirectory (gconf)
 add_subdirectory (gsettings)
 
 set (_deps

=== removed directory 'compizconfig/integration/gnome/gconf'
=== removed file 'compizconfig/integration/gnome/gconf/CMakeLists.txt'
--- compizconfig/integration/gnome/gconf/CMakeLists.txt	2012-08-16 03:41:18 +0000
+++ compizconfig/integration/gnome/gconf/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-include (FindPkgConfig)
-
-if (USE_GCONF)
-
-    set (_deps
-	glib-2.0>=2.20.0
-	gio-2.0>=2.25.0
-	gconf-2.0>=2.31.1)
-
-    compiz_pkg_check_modules (COMPIZCONFIG_GNOME_GCONF_INTEGRATION ${_deps})
-
-    if (COMPIZCONFIG_GNOME_GCONF_INTEGRATION_FOUND)
-
-	add_definitions (-DUSE_GCONF)
-
-	include_directories (${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include
-			     ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/include
-			     ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/gconf/include
-			     ${COMPIZCONFIG_GNOME_GCONF_INTEGRATION_INCLUDE_DIRS})
-
-	link_directories (${CMAKE_BINARY_DIR}/compizconfig/libcompizconfig
-			  ${CMAKE_BINARY_DIR}/compizconfig/integration/gnome
-			  ${COMPIZCONFIG_GNOME_GCONF_INTEGRATION_LIBRARY_DIRS})
-
-	add_library (compizconfig_gnome_integration_gconf_integrated_setting STATIC
-		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_gnome_integration_gconf_integrated_setting.c)
-
-	target_link_libraries (compizconfig_gnome_integration_gconf_integrated_setting
-			       compizconfig_gnome_integrated_setting
-			       compizconfig_gnome_integration_constants
-			       compizconfig
-			       ${COMPIZCONFIG_GNOME_GCONF_INTEGRATION_LIBRARIES})
-
-	add_library (compizconfig_gnome_integration_gconf_setting_factory STATIC
-		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_gnome_integration_gconf_integrated_setting_factory.c)
-
-	target_link_libraries (compizconfig_gnome_integration_gconf_setting_factory
-			       compizconfig_gnome_integration_constants
-			       compizconfig_gnome_integrated_setting
-			       compizconfig_gnome_integration_gconf_integrated_setting
-			       compizconfig
-			       ${COMPIZCONFIG_GNOME_GCONF_INTEGRATION_LIBRARIES})
-
-    endif (COMPIZCONFIG_GNOME_GCONF_INTEGRATION_FOUND)
-
-endif (USE_GCONF)

=== removed directory 'compizconfig/integration/gnome/gconf/include'
=== removed file 'compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting.h'
--- compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting.h	2012-10-06 16:11:05 +0000
+++ compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#ifndef _CCS_GNOME_GCONF_INTEGRATED_SETTING_H
-#define _CCS_GNOME_GCONF_INTEGRATED_SETTING_H
-
-#include <ccs-defs.h>
-#include <ccs-fwd.h>
-#include <ccs_gnome_fwd.h>
-#include <gconf/gconf-client.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-/**
- * @brief ccsGConfIntegratedSettingNew
- * @param base a CCSGNOMEIntegratedSetting
- * @param client a GConfClient
- * @param section the preceeding path to the keyname
- * @param ai a CCSObjectAllocationInterface
- * @return
- *
- * Creates the GConf implementation of a CCSIntegratedSetting, which will
- * write to GConf keys when necessary.
- */
-CCSIntegratedSetting *
-ccsGConfIntegratedSettingNew (CCSGNOMEIntegratedSettingInfo *base,
-			      GConfClient		*client,
-			      const char		*section,
-			      CCSObjectAllocationInterface *ai);
-
-COMPIZCONFIG_END_DECLS
-
-#endif

=== removed file 'compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting_factory.h'
--- compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting_factory.h	2012-10-06 16:11:05 +0000
+++ compizconfig/integration/gnome/gconf/include/ccs_gnome_integration_gconf_integrated_setting_factory.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#ifndef _CCS_GNOME_GCONF_INTEGRATED_SETTING_FACTORY_H
-#define _CCS_GNOME_GCONF_INTEGRATED_SETTING_FACTORY_H
-
-#include <ccs-defs.h>
-#include <ccs-object.h>
-#include <ccs-fwd.h>
-#include <ccs_gnome_fwd.h>
-#include <gconf/gconf-client.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-/**
- * @brief ccsGConfIntegratedSettingFactoryNew
- * @param client an existing GConfClient or NULL
- * @param data some data to pass to the change callback
- * @param ai a CCSObjectAllocationInterface
- * @return a new CCSIntegratedSettingFactory
- *
- * CCSGConfIntegratedSettingFactory implements CCSIntegratedSettingFactory *
- * and will create CCSGConfIntegratedSetting objects (which implement
- * CCSIntegratedSetting).
- */
-CCSIntegratedSettingFactory *
-ccsGConfIntegratedSettingFactoryNew (GConfClient		  *client,
-				     CCSGNOMEValueChangeData	  *data,
-				     CCSObjectAllocationInterface *ai);
-
-COMPIZCONFIG_END_DECLS
-
-#endif

=== removed directory 'compizconfig/integration/gnome/gconf/src'
=== removed file 'compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c'
--- compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c	2012-09-24 03:13:01 +0000
+++ compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c	1970-01-01 00:00:00 +0000
@@ -1,290 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gconf/gconf-value.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs-object.h>
-
-#include "ccs_gnome_integration_gconf_integrated_setting.h"
-#include "ccs_gnome_integrated_setting.h"
-#include "ccs_gnome_integration_constants.h"
-
-
-/* CCSGConfIntegratedSetting implementation */
-typedef struct _CCSGConfIntegratedSettingPrivate CCSGConfIntegratedSettingPrivate;
-
-struct _CCSGConfIntegratedSettingPrivate
-{
-    CCSGNOMEIntegratedSettingInfo *gnomeIntegratedSettingInfo;
-    GConfClient		      *client;
-    const char		      *sectionName;
-};
-
-SpecialOptionType
-ccsGConfIntegratedSettingGetSpecialOptionType (CCSGNOMEIntegratedSettingInfo *setting)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsGNOMEIntegratedSettingInfoGetSpecialOptionType (priv->gnomeIntegratedSettingInfo);
-}
-
-const char *
-ccsGConfIntegratedSettingGetGNOMEName (CCSGNOMEIntegratedSettingInfo *setting)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsGNOMEIntegratedSettingInfoGetGNOMEName (priv->gnomeIntegratedSettingInfo);
-}
-
-CCSSettingValue *
-ccsGConfIntegratedSettingReadValue (CCSIntegratedSetting *setting, CCSSettingType type)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-    CCSSettingValue		     *v = calloc (1, sizeof (CCSSettingValue));
-    const char			     *gnomeKeyName = ccsGNOMEIntegratedSettingInfoGetGNOMEName ((CCSGNOMEIntegratedSettingInfo *) setting);
-    char			     *gnomeKeyPath = g_strconcat (priv->sectionName, gnomeKeyName, NULL);
-
-    v->isListChild = FALSE;
-    v->parent = NULL;
-    v->refCount = 1;
-
-    GConfValue *gconfValue;
-    GError     *err = NULL;
-
-    gconfValue = gconf_client_get (priv->client,
-				   gnomeKeyPath,
-				   &err);
-
-    if (!gconfValue)
-    {
-	ccsError ("NULL encountered while reading GConf setting");
-	free (gnomeKeyPath);
-	free (v);
-	return NULL;
-    }
-
-    if (err)
-    {
-	ccsError ("%s", err->message);
-	g_error_free (err);
-	free (gnomeKeyPath);
-	free (v);
-	return NULL;
-    }
-
-    switch (type)
-    {
-	case TypeInt:
-	    if (gconfValue->type != GCONF_VALUE_INT)
-	    {
-		ccsError ("Expected integer value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    v->value.asInt = gconf_value_get_int (gconfValue);
-	    break;
-	case TypeBool:
-	    if (gconfValue->type != GCONF_VALUE_BOOL)
-	    {
-		ccsError ("Expected boolean value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    v->value.asBool = gconf_value_get_bool (gconfValue) ? TRUE : FALSE;
-	    break;
-	case TypeString:
-	case TypeKey:
-	    if (gconfValue->type != GCONF_VALUE_STRING)
-	    {
-		ccsError ("Expected string value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    const char *str = gconf_value_get_string (gconfValue);
-
-	    v->value.asString = strdup (str ? str : "");
-	    break;
-	default:
-	    g_assert_not_reached ();
-    }
-
-    gconf_value_free (gconfValue);
-    free (gnomeKeyPath);
-
-    return v;
-}
-
-void
-ccsGConfIntegratedSettingWriteValue (CCSIntegratedSetting *setting, CCSSettingValue *v, CCSSettingType type)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-    const char			     *gnomeKeyName = ccsGNOMEIntegratedSettingInfoGetGNOMEName ((CCSGNOMEIntegratedSettingInfo *) setting);
-    char			     *gnomeKeyPath = g_strconcat (priv->sectionName, gnomeKeyName, NULL);
-    GError			     *err = NULL;
-
-    switch (type)
-    {
-	case TypeInt:
-	    {
-		int currentValue = gconf_client_get_int (priv->client, gnomeKeyPath, &err);
-
-		if (!err && (currentValue != v->value.asInt))
-		    gconf_client_set_int(priv->client, gnomeKeyPath,
-					 v->value.asInt, NULL);
-	    }
-	    break;
-	case TypeBool:
-	    {
-		Bool     newValue = v->value.asBool;
-		gboolean currentValue;
-
-		currentValue = gconf_client_get_bool (priv->client, gnomeKeyPath, &err);
-
-		if (!err && ((currentValue && !newValue) ||
-			     (!currentValue && newValue)))
-		    gconf_client_set_bool (priv->client, gnomeKeyPath,
-					   newValue, NULL);
-	    }
-	    break;
-	case TypeString:
-	case TypeKey:
-	    {
-		char  *newValue = v->value.asString;
-		gchar *currentValue;
-
-		currentValue = gconf_client_get_string (priv->client, gnomeKeyPath, &err);
-
-		if (!err && currentValue)
-		{
-		    if (strcmp (currentValue, newValue) != 0)
-			gconf_client_set_string (priv->client, gnomeKeyPath,
-						 newValue, NULL);
-		    g_free (currentValue);
-		}
-	    }
-	    break;
-	default:
-	    g_assert_not_reached ();
-	    break;
-    }
-
-    if (err)
-    {
-	ccsError ("%s", err->message);
-	g_error_free (err);
-    }
-
-    free (gnomeKeyPath);
-}
-
-const char *
-ccsGConfIntegratedSettingInfoPluginName (CCSIntegratedSettingInfo *info)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoPluginName ((CCSIntegratedSettingInfo *) priv->gnomeIntegratedSettingInfo);
-}
-
-const char *
-ccsGConfIntegratedSettingInfoSettingName (CCSIntegratedSettingInfo *info)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoSettingName ((CCSIntegratedSettingInfo *) priv->gnomeIntegratedSettingInfo);
-}
-
-CCSSettingType
-ccsGConfIntegratedSettingInfoGetType (CCSIntegratedSettingInfo *info)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoGetType ((CCSIntegratedSettingInfo *) priv->gnomeIntegratedSettingInfo);
-}
-
-void
-ccsGConfIntegratedSettingFree (CCSIntegratedSetting *setting)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    ccsIntegratedSettingInfoUnref ((CCSIntegratedSettingInfo *) priv->gnomeIntegratedSettingInfo);
-    ccsObjectFinalize (setting);
-
-    (*setting->object.object_allocation->free_) (setting->object.object_allocation->allocator, setting);
-}
-
-void
-ccsGConfIntegratedSettingInfoFree (CCSIntegratedSettingInfo *info)
-{
-    ccsGConfIntegratedSettingFree ((CCSIntegratedSetting *) info);
-}
-
-void
-ccsGConfGNOMEIntegratedSettingInfoFree (CCSGNOMEIntegratedSettingInfo *info)
-{
-    ccsGConfIntegratedSettingFree ((CCSIntegratedSetting *) info);
-}
-
-const CCSGNOMEIntegratedSettingInfoInterface ccsGConfGNOMEIntegratedSettingInfoInterface =
-{
-    ccsGConfIntegratedSettingGetSpecialOptionType,
-    ccsGConfIntegratedSettingGetGNOMEName,
-    ccsGConfGNOMEIntegratedSettingInfoFree
-};
-
-const CCSIntegratedSettingInterface ccsGConfIntegratedSettingInterface =
-{
-    ccsGConfIntegratedSettingReadValue,
-    ccsGConfIntegratedSettingWriteValue,
-    ccsGConfIntegratedSettingFree
-};
-
-const CCSIntegratedSettingInfoInterface ccsGConfIntegratedSettingInfoInterface =
-{
-    ccsGConfIntegratedSettingInfoPluginName,
-    ccsGConfIntegratedSettingInfoSettingName,
-    ccsGConfIntegratedSettingInfoGetType,
-    ccsGConfIntegratedSettingInfoFree
-};
-
-CCSIntegratedSetting *
-ccsGConfIntegratedSettingNew (CCSGNOMEIntegratedSettingInfo *base,
-			      GConfClient		*client,
-			      const char		*section,
-			      CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSetting *setting = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIntegratedSetting));
-
-    if (!setting)
-	return NULL;
-
-    CCSGConfIntegratedSettingPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGConfIntegratedSettingPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, priv);
-	return NULL;
-    }
-
-    priv->gnomeIntegratedSettingInfo = base;
-    priv->client = client;
-    priv->sectionName = section;
-
-    ccsObjectInit (setting, ai);
-    ccsObjectSetPrivate (setting, (CCSPrivate *) priv);
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGConfIntegratedSettingInfoInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingInfoInterface));
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGConfIntegratedSettingInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingInterface));
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGConfGNOMEIntegratedSettingInfoInterface, GET_INTERFACE_TYPE (CCSGNOMEIntegratedSettingInfoInterface));
-    ccsIntegratedSettingRef (setting);
-
-    return setting;
-}

=== removed file 'compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting_factory.c'
--- compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting_factory.c	2013-05-13 13:23:20 +0000
+++ compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting_factory.c	1970-01-01 00:00:00 +0000
@@ -1,247 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gconf/gconf-value.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs-object.h>
-
-#include "ccs_gnome_integration.h"
-#include "ccs_gnome_integrated_setting.h"
-#include "ccs_gnome_integration_constants.h"
-#include "ccs_gnome_integration_gconf_integrated_setting.h"
-
-typedef struct _CCSGConfIntegratedSettingFactoryPrivate CCSGConfIntegratedSettingFactoryPrivate;
-
-struct _CCSGConfIntegratedSettingFactoryPrivate
-{
-    GConfClient *client;
-    guint       gnomeGConfNotifyIds[NUM_WATCHED_DIRS];
-    GHashTable  *pluginsToSettingsSectionsHashTable;
-    GHashTable  *pluginsToSettingsSpecialTypesHashTable;
-    GHashTable  *pluginsToSettingNameGNOMENameHashTable;
-    CCSGNOMEValueChangeData *valueChangedData;
-};
-
-static void
-gnomeGConfValueChanged (GConfClient *client,
-			guint       cnxn_id,
-			GConfEntry  *entry,
-			gpointer    user_data)
-{
-    CCSGNOMEValueChangeData *data = (CCSGNOMEValueChangeData *) user_data;
-    const gchar *keyName = gconf_entry_get_key (entry);
-    gchar       *baseName = g_path_get_basename (keyName);
-
-    /* We don't care if integration is not enabled */
-    if (!ccsGetIntegrationEnabled (data->context))
-	return;
-
-    CCSIntegratedSettingList settingList = ccsIntegratedSettingsStorageFindMatchingSettingsByPredicate (data->storage,
-													ccsGNOMEIntegrationFindSettingsMatchingPredicate,
-													baseName);
-
-    ccsIntegrationUpdateIntegratedSettings (data->integration,
-					    data->context,
-					    settingList);
-
-    g_free (baseName);
-}
-
-static CCSIntegratedSetting *
-createNewGConfIntegratedSetting (GConfClient *client,
-				 const char  *sectionName,
-				 const char  *gnomeName,
-				 const char  *pluginName,
-				 const char  *settingName,
-				 CCSSettingType type,
-				 SpecialOptionType specialOptionType,
-				 CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSettingInfo *sharedIntegratedSettingInfo = ccsSharedIntegratedSettingInfoNew (pluginName, settingName, type, ai);
-
-    if (!sharedIntegratedSettingInfo)
-	return NULL;
-
-    CCSGNOMEIntegratedSettingInfo *gnomeIntegratedSettingInfo = ccsGNOMEIntegratedSettingInfoNew (sharedIntegratedSettingInfo, specialOptionType, gnomeName, ai);
-
-    if (!gnomeIntegratedSettingInfo)
-    {
-	ccsIntegratedSettingInfoUnref (sharedIntegratedSettingInfo);
-	return NULL;
-    }
-
-    CCSIntegratedSetting *gconfIntegratedSetting = ccsGConfIntegratedSettingNew (gnomeIntegratedSettingInfo, client, sectionName, ai);
-
-    if (!gconfIntegratedSetting)
-    {
-	ccsIntegratedSettingInfoUnref ((CCSIntegratedSettingInfo *) gnomeIntegratedSettingInfo);
-	return NULL;
-    }
-
-    return gconfIntegratedSetting;
-}
-
-static void
-finiGConfClient (GConfClient    *client,
-		 guint		*gnomeGConfNotifyIds)
-{
-    int i;
-
-    gconf_client_clear_cache (client);
-
-    for (i = 0; i < NUM_WATCHED_DIRS; ++i)
-    {
-	if (gnomeGConfNotifyIds[i])
-	{
-	    gconf_client_notify_remove (client, gnomeGConfNotifyIds[0]);
-	    gnomeGConfNotifyIds[i] = 0;
-	}
-	gconf_client_remove_dir (client, watchedGConfGnomeDirectories[i], NULL);
-    }
-    gconf_client_suggest_sync (client, NULL);
-
-    g_object_unref (client);
-}
-
-static void
-registerGConfClient (GConfClient    *client,
-		     guint	    *gnomeGConfNotifyIds,
-		     CCSGNOMEValueChangeData *data,
-		     GConfClientNotifyFunc func)
-{
-    int i;
-
-    for (i = 0; i < NUM_WATCHED_DIRS; ++i)
-	gnomeGConfNotifyIds[i] = gconf_client_notify_add (client,
-							  watchedGConfGnomeDirectories[i],
-							  func, (gpointer) data,
-							  NULL, NULL);
-}
-
-static void
-initGConfClient (CCSIntegratedSettingFactory *factory)
-{
-    int i;
-    CCSGConfIntegratedSettingFactoryPrivate *priv = (CCSGConfIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
-    priv->client = gconf_client_get_default ();
-
-    for (i = 0; i < NUM_WATCHED_DIRS; ++i)
-	gconf_client_add_dir (priv->client, watchedGConfGnomeDirectories[i],
-			      GCONF_CLIENT_PRELOAD_NONE, NULL);
-}
-
-CCSIntegratedSetting *
-ccsGConfIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType (CCSIntegratedSettingFactory *factory,
-										 CCSIntegration		     *integration,
-										 const char		     *pluginName,
-										 const char		     *settingName,
-										 CCSSettingType		     type)
-{
-    CCSGConfIntegratedSettingFactoryPrivate *priv = (CCSGConfIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
-    GHashTable                              *settingsSectionsHashTable = g_hash_table_lookup (priv->pluginsToSettingsSectionsHashTable, pluginName);
-    GHashTable                              *settingsSpecialTypesHashTable = g_hash_table_lookup (priv->pluginsToSettingsSpecialTypesHashTable, pluginName);
-    GHashTable				    *settingsSettingNameGNOMENameHashTable = g_hash_table_lookup (priv->pluginsToSettingNameGNOMENameHashTable, pluginName);
-
-    if (!priv->client)
-	initGConfClient (factory);
-
-    if (!priv->gnomeGConfNotifyIds[0])
-	registerGConfClient (priv->client, priv->gnomeGConfNotifyIds, priv->valueChangedData, gnomeGConfValueChanged);
-
-    if (settingsSectionsHashTable &&
-	settingsSpecialTypesHashTable &&
-	settingsSettingNameGNOMENameHashTable)
-    {
-	const gchar *sectionName = g_hash_table_lookup (settingsSectionsHashTable, settingName);
-	SpecialOptionType specialType = (SpecialOptionType) GPOINTER_TO_INT (g_hash_table_lookup (settingsSpecialTypesHashTable, settingName));
-	const gchar *integratedName = g_hash_table_lookup (settingsSettingNameGNOMENameHashTable, settingName);
-
-	return createNewGConfIntegratedSetting (priv->client,
-						sectionName,
-						integratedName,
-						pluginName,
-						settingName,
-						type,
-						specialType,
-						factory->object.object_allocation);
-    }
-
-
-    return NULL;
-}
-
-void
-ccsGConfIntegratedSettingFactoryFree (CCSIntegratedSettingFactory *factory)
-{
-    CCSGConfIntegratedSettingFactoryPrivate *priv = (CCSGConfIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
-
-    if (priv->client)
-	finiGConfClient (priv->client, priv->gnomeGConfNotifyIds);
-
-    if (priv->pluginsToSettingsSectionsHashTable)
-	g_hash_table_unref (priv->pluginsToSettingsSectionsHashTable);
-
-    if (priv->pluginsToSettingsSpecialTypesHashTable)
-	g_hash_table_unref (priv->pluginsToSettingsSpecialTypesHashTable);
-
-    if (priv->pluginsToSettingNameGNOMENameHashTable)
-	g_hash_table_unref (priv->pluginsToSettingNameGNOMENameHashTable);
-
-    ccsObjectFinalize (factory);
-    (*factory->object.object_allocation->free_) (factory->object.object_allocation->allocator, factory);
-}
-
-
-const CCSIntegratedSettingFactoryInterface ccsGConfIntegratedSettingFactoryInterface =
-{
-    ccsGConfIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType,
-    ccsGConfIntegratedSettingFactoryFree
-};
-
-CCSIntegratedSettingFactory *
-ccsGConfIntegratedSettingFactoryNew (GConfClient		  *client,
-				     CCSGNOMEValueChangeData	  *valueChangedData,
-				     CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSettingFactory *factory = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIntegratedSettingFactory));
-
-    if (!factory)
-	return NULL;
-
-    CCSGConfIntegratedSettingFactoryPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGConfIntegratedSettingFactoryPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, factory);
-	return NULL;
-    }
-
-    if (client)
-    {
-	int i;
-	priv->client = (GConfClient *) g_object_ref (client);
-	for (i = 0; i < NUM_WATCHED_DIRS; ++i)
-	    gconf_client_add_dir (priv->client, watchedGConfGnomeDirectories[i],
-				  GCONF_CLIENT_PRELOAD_NONE, NULL);
-    }
-    else
-	priv->client = NULL;
-
-    priv->pluginsToSettingsSectionsHashTable = ccsGNOMEIntegrationPopulateCategoriesHashTables ();
-    priv->pluginsToSettingsSpecialTypesHashTable = ccsGNOMEIntegrationPopulateSpecialTypesHashTables ();
-    priv->pluginsToSettingNameGNOMENameHashTable = ccsGNOMEIntegrationPopulateSettingNameToGNOMENameHashTables ();
-    priv->valueChangedData = valueChangedData;
-
-    ccsObjectInit (factory, ai);
-    ccsObjectSetPrivate (factory, (CCSPrivate *) priv);
-    ccsObjectAddInterface (factory, (const CCSInterface *) &ccsGConfIntegratedSettingFactoryInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingFactoryInterface));
-
-    ccsIntegratedSettingFactoryRef (factory);
-
-    return factory;
-}
-

=== modified file 'compizconfig/integration/gnome/gsettings/CMakeLists.txt'
--- compizconfig/integration/gnome/gsettings/CMakeLists.txt	2012-10-08 13:50:56 +0000
+++ compizconfig/integration/gnome/gsettings/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -10,8 +10,6 @@
 
     if (COMPIZCONFIG_GNOME_GSETTINGS_INTEGRATION_FOUND)
 
-	add_definitions (-DUSE_GCONF)
-
 	include_directories (${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include
 			     ${CMAKE_SOURCE_DIR}/compizconfig/gsettings/gsettings_backend_shared
 			     ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/include

=== modified file 'compizconfig/integration/gnome/include/ccs_gnome_integration.h'
--- compizconfig/integration/gnome/include/ccs_gnome_integration.h	2012-10-06 16:11:05 +0000
+++ compizconfig/integration/gnome/include/ccs_gnome_integration.h	2015-12-11 09:51:42 +0000
@@ -1,5 +1,5 @@
-#ifndef _CCS_COMPIZCONFIG_GNOME_GCONF_INTEGRATION
-#define _CCS_COMPIZCONFIG_GNOME_GCONF_INTEGRATION
+#ifndef _CCS_COMPIZCONFIG_GNOME_INTEGRATION
+#define _CCS_COMPIZCONFIG_GNOME_INTEGRATION
 
 #include <ccs-defs.h>
 #include <ccs-fwd.h>

=== modified file 'compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h'
--- compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h	2014-03-04 20:00:28 +0000
+++ compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h	2015-12-11 09:51:42 +0000
@@ -182,8 +182,6 @@
 
 extern const CCSGNOMEIntegratedPluginNames ccsGNOMEIntegratedPluginNames;
 
-extern const char* watchedGConfGnomeDirectories[];
-
 typedef struct _CCSGSettingsWrapperIntegratedSchemasQuarks
 {
     GQuark ORG_GNOME_DESKTOP_WM_PREFERENCES;

=== modified file 'compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c'
--- compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c	2014-03-04 20:00:28 +0000
+++ compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c	2015-12-11 09:51:42 +0000
@@ -1,12 +1,6 @@
 #include <glib.h>
 #include "ccs_gnome_integration_constants.h"
 
-const char * watchedGConfGnomeDirectories[] = {
-    METACITY,
-    "/desktop/gnome/applications/terminal",
-    "/apps/panel/applets/window_list/prefs"
-};
-
 const CCSGNOMEIntegratedSettingNames ccsGNOMEIntegratedSettingNames =
 {
     { "audible_bell", "audible_bell" },

=== modified file 'compizconfig/integration/mate/CMakeLists.txt'
--- compizconfig/integration/mate/CMakeLists.txt	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -1,6 +1,5 @@
 include (FindPkgConfig)
 
-add_subdirectory (gconf)
 add_subdirectory (gsettings)
 
 set (_deps

=== removed directory 'compizconfig/integration/mate/gconf'
=== removed file 'compizconfig/integration/mate/gconf/CMakeLists.txt'
--- compizconfig/integration/mate/gconf/CMakeLists.txt	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gconf/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-include (FindPkgConfig)
-
-if (USE_GCONF)
-
-    set (_deps
-	glib-2.0>=2.20.0
-	gio-2.0>=2.25.0
-	gconf-2.0>=2.31.1)
-
-    compiz_pkg_check_modules (COMPIZCONFIG_MATE_GCONF_INTEGRATION ${_deps})
-
-    if (COMPIZCONFIG_MATE_GCONF_INTEGRATION_FOUND)
-
-	add_definitions (-DUSE_GCONF)
-
-	include_directories (${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include
-			     ${CMAKE_SOURCE_DIR}/compizconfig/integration/mate/include
-			     ${CMAKE_SOURCE_DIR}/compizconfig/integration/mate/gconf/include
-			     ${COMPIZCONFIG_MATE_GCONF_INTEGRATION_INCLUDE_DIRS})
-
-	link_directories (${CMAKE_BINARY_DIR}/compizconfig/libcompizconfig
-			  ${CMAKE_BINARY_DIR}/compizconfig/integration/mate
-			  ${COMPIZCONFIG_MATE_GCONF_INTEGRATION_LIBRARY_DIRS})
-
-	add_library (compizconfig_mate_integration_gconf_integrated_setting STATIC
-		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_mate_integration_gconf_integrated_setting.c)
-
-	target_link_libraries (compizconfig_mate_integration_gconf_integrated_setting
-			       compizconfig_mate_integrated_setting
-			       compizconfig_mate_integration_constants
-			       compizconfig
-			       ${COMPIZCONFIG_MATE_GCONF_INTEGRATION_LIBRARIES})
-
-	add_library (compizconfig_mate_integration_gconf_setting_factory STATIC
-		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_mate_integration_gconf_integrated_setting_factory.c)
-
-	target_link_libraries (compizconfig_mate_integration_gconf_setting_factory
-			       compizconfig_mate_integration_constants
-			       compizconfig_mate_integrated_setting
-			       compizconfig_mate_integration_gconf_integrated_setting
-			       compizconfig
-			       ${COMPIZCONFIG_MATE_GCONF_INTEGRATION_LIBRARIES})
-
-    endif (COMPIZCONFIG_MATE_GCONF_INTEGRATION_FOUND)
-
-endif (USE_GCONF)

=== removed directory 'compizconfig/integration/mate/gconf/include'
=== removed file 'compizconfig/integration/mate/gconf/include/ccs_mate_integration_gconf_integrated_setting.h'
--- compizconfig/integration/mate/gconf/include/ccs_mate_integration_gconf_integrated_setting.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gconf/include/ccs_mate_integration_gconf_integrated_setting.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#ifndef _CCS_MATE_GCONF_INTEGRATED_SETTING_H
-#define _CCS_MATE_GCONF_INTEGRATED_SETTING_H
-
-#include <ccs-defs.h>
-#include <ccs-fwd.h>
-#include <ccs_mate_fwd.h>
-#include <gconf/gconf-client.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-/**
- * @brief ccsGConfIntegratedSettingNew
- * @param base a CCSMATEIntegratedSetting
- * @param client a GConfClient
- * @param section the preceeding path to the keyname
- * @param ai a CCSObjectAllocationInterface
- * @return
- *
- * Creates the GConf implementation of a CCSIntegratedSetting, which will
- * write to GConf keys when necessary.
- */
-CCSIntegratedSetting *
-ccsGConfIntegratedSettingNew (CCSMATEIntegratedSettingInfo *base,
-			      GConfClient		*client,
-			      const char		*section,
-			      CCSObjectAllocationInterface *ai);
-
-COMPIZCONFIG_END_DECLS
-
-#endif

=== removed file 'compizconfig/integration/mate/gconf/include/ccs_mate_integration_gconf_integrated_setting_factory.h'
--- compizconfig/integration/mate/gconf/include/ccs_mate_integration_gconf_integrated_setting_factory.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gconf/include/ccs_mate_integration_gconf_integrated_setting_factory.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#ifndef _CCS_MATE_GCONF_INTEGRATED_SETTING_FACTORY_H
-#define _CCS_MATE_GCONF_INTEGRATED_SETTING_FACTORY_H
-
-#include <ccs-defs.h>
-#include <ccs-object.h>
-#include <ccs-fwd.h>
-#include <ccs_mate_fwd.h>
-#include <gconf/gconf-client.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-/**
- * @brief ccsGConfIntegratedSettingFactoryNew
- * @param client an existing GConfClient or NULL
- * @param data some data to pass to the change callback
- * @param ai a CCSObjectAllocationInterface
- * @return a new CCSIntegratedSettingFactory
- *
- * CCSGConfIntegratedSettingFactory implements CCSIntegratedSettingFactory *
- * and will create CCSGConfIntegratedSetting objects (which implement
- * CCSIntegratedSetting).
- */
-CCSIntegratedSettingFactory *
-ccsGConfIntegratedSettingFactoryNew (GConfClient		  *client,
-				     CCSMATEValueChangeData	  *data,
-				     CCSObjectAllocationInterface *ai);
-
-COMPIZCONFIG_END_DECLS
-
-#endif

=== removed directory 'compizconfig/integration/mate/gconf/src'
=== removed file 'compizconfig/integration/mate/gconf/src/ccs_mate_integration_gconf_integrated_setting.c'
--- compizconfig/integration/mate/gconf/src/ccs_mate_integration_gconf_integrated_setting.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gconf/src/ccs_mate_integration_gconf_integrated_setting.c	1970-01-01 00:00:00 +0000
@@ -1,290 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gconf/gconf-value.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs-object.h>
-
-#include "ccs_mate_integration_gconf_integrated_setting.h"
-#include "ccs_mate_integrated_setting.h"
-#include "ccs_mate_integration_constants.h"
-
-
-/* CCSGConfIntegratedSetting implementation */
-typedef struct _CCSGConfIntegratedSettingPrivate CCSGConfIntegratedSettingPrivate;
-
-struct _CCSGConfIntegratedSettingPrivate
-{
-    CCSMATEIntegratedSettingInfo *mateIntegratedSettingInfo;
-    GConfClient		      *client;
-    const char		      *sectionName;
-};
-
-SpecialOptionType
-ccsGConfIntegratedSettingGetSpecialOptionType (CCSMATEIntegratedSettingInfo *setting)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsMATEIntegratedSettingInfoGetSpecialOptionType (priv->mateIntegratedSettingInfo);
-}
-
-const char *
-ccsGConfIntegratedSettingGetMATEName (CCSMATEIntegratedSettingInfo *setting)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsMATEIntegratedSettingInfoGetMATEName (priv->mateIntegratedSettingInfo);
-}
-
-CCSSettingValue *
-ccsGConfIntegratedSettingReadValue (CCSIntegratedSetting *setting, CCSSettingType type)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-    CCSSettingValue		     *v = calloc (1, sizeof (CCSSettingValue));
-    const char			     *mateKeyName = ccsMATEIntegratedSettingInfoGetMATEName ((CCSMATEIntegratedSettingInfo *) setting);
-    char			     *mateKeyPath = g_strconcat (priv->sectionName, mateKeyName, NULL);
-
-    v->isListChild = FALSE;
-    v->parent = NULL;
-    v->refCount = 1;
-
-    GConfValue *gconfValue;
-    GError     *err = NULL;
-
-    gconfValue = gconf_client_get (priv->client,
-				   mateKeyPath,
-				   &err);
-
-    if (!gconfValue)
-    {
-	ccsError ("NULL encountered while reading GConf setting");
-	free (mateKeyPath);
-	free (v);
-	return NULL;
-    }
-
-    if (err)
-    {
-	ccsError ("%s", err->message);
-	g_error_free (err);
-	free (mateKeyPath);
-	free (v);
-	return NULL;
-    }
-
-    switch (type)
-    {
-	case TypeInt:
-	    if (gconfValue->type != GCONF_VALUE_INT)
-	    {
-		ccsError ("Expected integer value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    v->value.asInt = gconf_value_get_int (gconfValue);
-	    break;
-	case TypeBool:
-	    if (gconfValue->type != GCONF_VALUE_BOOL)
-	    {
-		ccsError ("Expected boolean value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    v->value.asBool = gconf_value_get_bool (gconfValue) ? TRUE : FALSE;
-	    break;
-	case TypeString:
-	case TypeKey:
-	    if (gconfValue->type != GCONF_VALUE_STRING)
-	    {
-		ccsError ("Expected string value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    const char *str = gconf_value_get_string (gconfValue);
-
-	    v->value.asString = strdup (str ? str : "");
-	    break;
-	default:
-	    g_assert_not_reached ();
-    }
-
-    gconf_value_free (gconfValue);
-    free (mateKeyPath);
-
-    return v;
-}
-
-void
-ccsGConfIntegratedSettingWriteValue (CCSIntegratedSetting *setting, CCSSettingValue *v, CCSSettingType type)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-    const char			     *mateKeyName = ccsMATEIntegratedSettingInfoGetMATEName ((CCSMATEIntegratedSettingInfo *) setting);
-    char			     *mateKeyPath = g_strconcat (priv->sectionName, mateKeyName, NULL);
-    GError			     *err = NULL;
-
-    switch (type)
-    {
-	case TypeInt:
-	    {
-		int currentValue = gconf_client_get_int (priv->client, mateKeyPath, &err);
-
-		if (!err && (currentValue != v->value.asInt))
-		    gconf_client_set_int(priv->client, mateKeyPath,
-					 v->value.asInt, NULL);
-	    }
-	    break;
-	case TypeBool:
-	    {
-		Bool     newValue = v->value.asBool;
-		gboolean currentValue;
-
-		currentValue = gconf_client_get_bool (priv->client, mateKeyPath, &err);
-
-		if (!err && ((currentValue && !newValue) ||
-			     (!currentValue && newValue)))
-		    gconf_client_set_bool (priv->client, mateKeyPath,
-					   newValue, NULL);
-	    }
-	    break;
-	case TypeString:
-	case TypeKey:
-	    {
-		char  *newValue = v->value.asString;
-		gchar *currentValue;
-
-		currentValue = gconf_client_get_string (priv->client, mateKeyPath, &err);
-
-		if (!err && currentValue)
-		{
-		    if (strcmp (currentValue, newValue) != 0)
-			gconf_client_set_string (priv->client, mateKeyPath,
-						 newValue, NULL);
-		    g_free (currentValue);
-		}
-	    }
-	    break;
-	default:
-	    g_assert_not_reached ();
-	    break;
-    }
-
-    if (err)
-    {
-	ccsError ("%s", err->message);
-	g_error_free (err);
-    }
-
-    free (mateKeyPath);
-}
-
-const char *
-ccsGConfIntegratedSettingInfoPluginName (CCSIntegratedSettingInfo *info)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoPluginName ((CCSIntegratedSettingInfo *) priv->mateIntegratedSettingInfo);
-}
-
-const char *
-ccsGConfIntegratedSettingInfoSettingName (CCSIntegratedSettingInfo *info)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoSettingName ((CCSIntegratedSettingInfo *) priv->mateIntegratedSettingInfo);
-}
-
-CCSSettingType
-ccsGConfIntegratedSettingInfoGetType (CCSIntegratedSettingInfo *info)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoGetType ((CCSIntegratedSettingInfo *) priv->mateIntegratedSettingInfo);
-}
-
-void
-ccsGConfIntegratedSettingFree (CCSIntegratedSetting *setting)
-{
-    CCSGConfIntegratedSettingPrivate *priv = (CCSGConfIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    ccsIntegratedSettingInfoUnref ((CCSIntegratedSettingInfo *) priv->mateIntegratedSettingInfo);
-    ccsObjectFinalize (setting);
-
-    (*setting->object.object_allocation->free_) (setting->object.object_allocation->allocator, setting);
-}
-
-void
-ccsGConfIntegratedSettingInfoFree (CCSIntegratedSettingInfo *info)
-{
-    ccsGConfIntegratedSettingFree ((CCSIntegratedSetting *) info);
-}
-
-void
-ccsGConfMATEIntegratedSettingInfoFree (CCSMATEIntegratedSettingInfo *info)
-{
-    ccsGConfIntegratedSettingFree ((CCSIntegratedSetting *) info);
-}
-
-const CCSMATEIntegratedSettingInfoInterface ccsGConfMATEIntegratedSettingInfoInterface =
-{
-    ccsGConfIntegratedSettingGetSpecialOptionType,
-    ccsGConfIntegratedSettingGetMATEName,
-    ccsGConfMATEIntegratedSettingInfoFree
-};
-
-const CCSIntegratedSettingInterface ccsGConfIntegratedSettingInterface =
-{
-    ccsGConfIntegratedSettingReadValue,
-    ccsGConfIntegratedSettingWriteValue,
-    ccsGConfIntegratedSettingFree
-};
-
-const CCSIntegratedSettingInfoInterface ccsGConfIntegratedSettingInfoInterface =
-{
-    ccsGConfIntegratedSettingInfoPluginName,
-    ccsGConfIntegratedSettingInfoSettingName,
-    ccsGConfIntegratedSettingInfoGetType,
-    ccsGConfIntegratedSettingInfoFree
-};
-
-CCSIntegratedSetting *
-ccsGConfIntegratedSettingNew (CCSMATEIntegratedSettingInfo *base,
-			      GConfClient		*client,
-			      const char		*section,
-			      CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSetting *setting = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIntegratedSetting));
-
-    if (!setting)
-	return NULL;
-
-    CCSGConfIntegratedSettingPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGConfIntegratedSettingPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, priv);
-	return NULL;
-    }
-
-    priv->mateIntegratedSettingInfo = base;
-    priv->client = client;
-    priv->sectionName = section;
-
-    ccsObjectInit (setting, ai);
-    ccsObjectSetPrivate (setting, (CCSPrivate *) priv);
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGConfIntegratedSettingInfoInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingInfoInterface));
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGConfIntegratedSettingInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingInterface));
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGConfMATEIntegratedSettingInfoInterface, GET_INTERFACE_TYPE (CCSMATEIntegratedSettingInfoInterface));
-    ccsIntegratedSettingRef (setting);
-
-    return setting;
-}

=== removed file 'compizconfig/integration/mate/gconf/src/ccs_mate_integration_gconf_integrated_setting_factory.c'
--- compizconfig/integration/mate/gconf/src/ccs_mate_integration_gconf_integrated_setting_factory.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gconf/src/ccs_mate_integration_gconf_integrated_setting_factory.c	1970-01-01 00:00:00 +0000
@@ -1,247 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gconf/gconf-value.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs-object.h>
-
-#include "ccs_mate_integration.h"
-#include "ccs_mate_integrated_setting.h"
-#include "ccs_mate_integration_constants.h"
-#include "ccs_mate_integration_gconf_integrated_setting.h"
-
-typedef struct _CCSGConfIntegratedSettingFactoryPrivate CCSGConfIntegratedSettingFactoryPrivate;
-
-struct _CCSGConfIntegratedSettingFactoryPrivate
-{
-    GConfClient *client;
-    guint       mateGConfNotifyIds[NUM_WATCHED_DIRS];
-    GHashTable  *pluginsToSettingsSectionsHashTable;
-    GHashTable  *pluginsToSettingsSpecialTypesHashTable;
-    GHashTable  *pluginsToSettingNameMATENameHashTable;
-    CCSMATEValueChangeData *valueChangedData;
-};
-
-static void
-mateGConfValueChanged (GConfClient *client,
-			guint       cnxn_id,
-			GConfEntry  *entry,
-			gpointer    user_data)
-{
-    CCSMATEValueChangeData *data = (CCSMATEValueChangeData *) user_data;
-    const gchar *keyName = gconf_entry_get_key (entry);
-    gchar       *baseName = g_path_get_basename (keyName);
-
-    /* We don't care if integration is not enabled */
-    if (!ccsGetIntegrationEnabled (data->context))
-	return;
-
-    CCSIntegratedSettingList settingList = ccsIntegratedSettingsStorageFindMatchingSettingsByPredicate (data->storage,
-													ccsMATEIntegrationFindSettingsMatchingPredicate,
-													baseName);
-
-    ccsIntegrationUpdateIntegratedSettings (data->integration,
-					    data->context,
-					    settingList);
-
-    g_free (baseName);
-}
-
-static CCSIntegratedSetting *
-createNewGConfIntegratedSetting (GConfClient *client,
-				 const char  *sectionName,
-				 const char  *mateName,
-				 const char  *pluginName,
-				 const char  *settingName,
-				 CCSSettingType type,
-				 SpecialOptionType specialOptionType,
-				 CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSettingInfo *sharedIntegratedSettingInfo = ccsSharedIntegratedSettingInfoNew (pluginName, settingName, type, ai);
-
-    if (!sharedIntegratedSettingInfo)
-	return NULL;
-
-    CCSMATEIntegratedSettingInfo *mateIntegratedSettingInfo = ccsMATEIntegratedSettingInfoNew (sharedIntegratedSettingInfo, specialOptionType, mateName, ai);
-
-    if (!mateIntegratedSettingInfo)
-    {
-	ccsIntegratedSettingInfoUnref (sharedIntegratedSettingInfo);
-	return NULL;
-    }
-
-    CCSIntegratedSetting *gconfIntegratedSetting = ccsGConfIntegratedSettingNew (mateIntegratedSettingInfo, client, sectionName, ai);
-
-    if (!gconfIntegratedSetting)
-    {
-	ccsIntegratedSettingInfoUnref ((CCSIntegratedSettingInfo *) mateIntegratedSettingInfo);
-	return NULL;
-    }
-
-    return gconfIntegratedSetting;
-}
-
-static void
-finiGConfClient (GConfClient    *client,
-		 guint		*mateGConfNotifyIds)
-{
-    int i;
-
-    gconf_client_clear_cache (client);
-
-    for (i = 0; i < NUM_WATCHED_DIRS; ++i)
-    {
-	if (mateGConfNotifyIds[i])
-	{
-	    gconf_client_notify_remove (client, mateGConfNotifyIds[0]);
-	    mateGConfNotifyIds[i] = 0;
-	}
-	gconf_client_remove_dir (client, watchedGConfMateDirectories[i], NULL);
-    }
-    gconf_client_suggest_sync (client, NULL);
-
-    g_object_unref (client);
-}
-
-static void
-registerGConfClient (GConfClient    *client,
-		     guint	    *mateGConfNotifyIds,
-		     CCSMATEValueChangeData *data,
-		     GConfClientNotifyFunc func)
-{
-    int i;
-
-    for (i = 0; i < NUM_WATCHED_DIRS; ++i)
-	mateGConfNotifyIds[i] = gconf_client_notify_add (client,
-							  watchedGConfMateDirectories[i],
-							  func, (gpointer) data,
-							  NULL, NULL);
-}
-
-static void
-initGConfClient (CCSIntegratedSettingFactory *factory)
-{
-    int i;
-    CCSGConfIntegratedSettingFactoryPrivate *priv = (CCSGConfIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
-    priv->client = gconf_client_get_default ();
-
-    for (i = 0; i < NUM_WATCHED_DIRS; ++i)
-	gconf_client_add_dir (priv->client, watchedGConfMateDirectories[i],
-			      GCONF_CLIENT_PRELOAD_NONE, NULL);
-}
-
-CCSIntegratedSetting *
-ccsGConfIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType (CCSIntegratedSettingFactory *factory,
-										 CCSIntegration		     *integration,
-										 const char		     *pluginName,
-										 const char		     *settingName,
-										 CCSSettingType		     type)
-{
-    CCSGConfIntegratedSettingFactoryPrivate *priv = (CCSGConfIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
-    GHashTable                              *settingsSectionsHashTable = g_hash_table_lookup (priv->pluginsToSettingsSectionsHashTable, pluginName);
-    GHashTable                              *settingsSpecialTypesHashTable = g_hash_table_lookup (priv->pluginsToSettingsSpecialTypesHashTable, pluginName);
-    GHashTable				    *settingsSettingNameMATENameHashTable = g_hash_table_lookup (priv->pluginsToSettingNameMATENameHashTable, pluginName);
-
-    if (!priv->client)
-	initGConfClient (factory);
-
-    if (!priv->mateGConfNotifyIds[0])
-	registerGConfClient (priv->client, priv->mateGConfNotifyIds, priv->valueChangedData, mateGConfValueChanged);
-
-    if (settingsSectionsHashTable &&
-	settingsSpecialTypesHashTable &&
-	settingsSettingNameMATENameHashTable)
-    {
-	const gchar *sectionName = g_hash_table_lookup (settingsSectionsHashTable, settingName);
-	SpecialOptionType specialType = (SpecialOptionType) GPOINTER_TO_INT (g_hash_table_lookup (settingsSpecialTypesHashTable, settingName));
-	const gchar *integratedName = g_hash_table_lookup (settingsSettingNameMATENameHashTable, settingName);
-
-	return createNewGConfIntegratedSetting (priv->client,
-						sectionName,
-						integratedName,
-						pluginName,
-						settingName,
-						type,
-						specialType,
-						factory->object.object_allocation);
-    }
-
-
-    return NULL;
-}
-
-void
-ccsGConfIntegratedSettingFactoryFree (CCSIntegratedSettingFactory *factory)
-{
-    CCSGConfIntegratedSettingFactoryPrivate *priv = (CCSGConfIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
-
-    if (priv->client)
-	finiGConfClient (priv->client, priv->mateGConfNotifyIds);
-
-    if (priv->pluginsToSettingsSectionsHashTable)
-	g_hash_table_unref (priv->pluginsToSettingsSectionsHashTable);
-
-    if (priv->pluginsToSettingsSpecialTypesHashTable)
-	g_hash_table_unref (priv->pluginsToSettingsSpecialTypesHashTable);
-
-    if (priv->pluginsToSettingNameMATENameHashTable)
-	g_hash_table_unref (priv->pluginsToSettingNameMATENameHashTable);
-
-    ccsObjectFinalize (factory);
-    (*factory->object.object_allocation->free_) (factory->object.object_allocation->allocator, factory);
-}
-
-
-const CCSIntegratedSettingFactoryInterface ccsGConfIntegratedSettingFactoryInterface =
-{
-    ccsGConfIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType,
-    ccsGConfIntegratedSettingFactoryFree
-};
-
-CCSIntegratedSettingFactory *
-ccsGConfIntegratedSettingFactoryNew (GConfClient		  *client,
-				     CCSMATEValueChangeData	  *valueChangedData,
-				     CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSettingFactory *factory = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIntegratedSettingFactory));
-
-    if (!factory)
-	return NULL;
-
-    CCSGConfIntegratedSettingFactoryPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGConfIntegratedSettingFactoryPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, factory);
-	return NULL;
-    }
-
-    if (client)
-    {
-	int i;
-	priv->client = (GConfClient *) g_object_ref (client);
-	for (i = 0; i < NUM_WATCHED_DIRS; ++i)
-	    gconf_client_add_dir (priv->client, watchedGConfMateDirectories[i],
-				  GCONF_CLIENT_PRELOAD_NONE, NULL);
-    }
-    else
-	priv->client = NULL;
-
-    priv->pluginsToSettingsSectionsHashTable = ccsMATEIntegrationPopulateCategoriesHashTables ();
-    priv->pluginsToSettingsSpecialTypesHashTable = ccsMATEIntegrationPopulateSpecialTypesHashTables ();
-    priv->pluginsToSettingNameMATENameHashTable = ccsMATEIntegrationPopulateSettingNameToMATENameHashTables ();
-    priv->valueChangedData = valueChangedData;
-
-    ccsObjectInit (factory, ai);
-    ccsObjectSetPrivate (factory, (CCSPrivate *) priv);
-    ccsObjectAddInterface (factory, (const CCSInterface *) &ccsGConfIntegratedSettingFactoryInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingFactoryInterface));
-
-    ccsIntegratedSettingFactoryRef (factory);
-
-    return factory;
-}
-

=== modified file 'compizconfig/integration/mate/gsettings/CMakeLists.txt'
--- compizconfig/integration/mate/gsettings/CMakeLists.txt	2015-02-12 19:22:09 +0000
+++ compizconfig/integration/mate/gsettings/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -10,8 +10,6 @@
 
     if (COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_FOUND)
 
-	add_definitions (-DUSE_GCONF)
-
 	include_directories (${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include
 			     ${CMAKE_SOURCE_DIR}/compizconfig/gsettings/gsettings_backend_shared
 			     ${CMAKE_SOURCE_DIR}/compizconfig/integration/mate/include

=== modified file 'compizconfig/integration/mate/include/ccs_mate_integration.h'
--- compizconfig/integration/mate/include/ccs_mate_integration.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/include/ccs_mate_integration.h	2015-12-11 09:51:42 +0000
@@ -1,5 +1,5 @@
-#ifndef _CCS_COMPIZCONFIG_MATE_GCONF_INTEGRATION
-#define _CCS_COMPIZCONFIG_MATE_GCONF_INTEGRATION
+#ifndef _CCS_COMPIZCONFIG_MATE_INTEGRATION
+#define _CCS_COMPIZCONFIG_MATE_INTEGRATION
 
 #include <ccs-defs.h>
 #include <ccs-fwd.h>

=== modified file 'compizconfig/libcompizconfig/include/ccs-backend.h'
--- compizconfig/libcompizconfig/include/ccs-backend.h	2013-02-21 16:41:49 +0000
+++ compizconfig/libcompizconfig/include/ccs-backend.h	2015-12-11 09:51:42 +0000
@@ -380,7 +380,7 @@
     CCSBackendGetInfoFunc      backendGetInfo;
 
     /* something like a event loop call for the backend,
-       so it can check for file changes (gconf changes in the gconf backend)
+       so it can check for file changes
        no need for reload settings signals anymore */
     CCSBackendExecuteEventsFunc executeEvents;
 
@@ -423,7 +423,7 @@
  * @param flags ProcessEventsGlibMainLoopMask or 0
  *
  * something like a event loop call for the backend,
- * so it can check for file changes (gconf changes in the gconf backend)
+ * so it can check for file changes
  */
 void ccsBackendExecuteEvents (CCSBackend *backend, unsigned int flags);
 

=== modified file 'compizconfig/libcompizconfig/src/compiz.cpp'
--- compizconfig/libcompizconfig/src/compiz.cpp	2014-12-02 11:35:11 +0000
+++ compizconfig/libcompizconfig/src/compiz.cpp	2015-12-11 09:51:42 +0000
@@ -872,8 +872,8 @@
     if (ccsFindPlugin (context, name))
 	return;
 
-    if (!strcmp (name, "ini") || !strcmp (name, "gconf") ||
-	!strcmp (name, "ccp") || !strcmp (name, "kconfig"))
+    if (!strcmp (name, "ini") || !strcmp (name, "ccp") ||
+	!strcmp (name, "kconfig"))
 	return;
 
     plugin = (CCSPlugin *) calloc (1, sizeof (CCSPlugin));
@@ -2534,8 +2534,8 @@
 	return FALSE;
     }
 
-    if (!strcmp (name, "ini") || !strcmp (name, "gconf") ||
-	!strcmp (name, "ccp") || !strcmp (name, "kconfig"))
+    if (!strcmp (name, "ini") || !strcmp (name, "ccp") ||
+	!strcmp (name, "kconfig"))
     {
 	free (name);
 	return FALSE;
@@ -2986,8 +2986,8 @@
     if (ccsFindPlugin (context, name))
 	return;
 
-    if (!strcmp (name, "ini") || !strcmp (name, "gconf") ||
-	!strcmp (name, "ccp") || !strcmp (name, "kconfig"))
+    if (!strcmp (name, "ini") || !strcmp (name, "ccp") ||
+	!strcmp (name, "kconfig"))
 	return;
 
     plugin = (CCSPlugin *) calloc (1, sizeof (CCSPlugin));

=== modified file 'debian/compiz-gnome.install'
--- debian/compiz-gnome.install	2014-11-24 22:25:07 +0000
+++ debian/compiz-gnome.install	2015-12-11 09:51:42 +0000
@@ -6,6 +6,5 @@
 usr/lib/*/compizconfig/backends/libgsettings.so
 usr/lib/*/libcompizconfig_gsettings_backend.so
 usr/share/applications/compiz.desktop usr/share/gnome/wm-properties/
-usr/share/gconf/schemas/*.schemas
 usr/share/glib-2.0/schemas/*.xml
 usr/share/gnome-control-center

=== modified file 'debian/control'
--- debian/control	2015-08-13 22:15:37 +0000
+++ debian/control	2015-12-11 09:51:42 +0000
@@ -155,11 +155,9 @@
 Recommends: gnome-system-monitor | mate-system-monitor,
 Replaces: compiz-plugins-main (<= 1:0.9.8),
           compiz-plugins-main-default (<= 1:0.9.8),
-          compizconfig-backend-gconf (<= 1:0.9.8),
           libcompizconfig0 (<= 1:0.9.8),
 Breaks: compiz-plugins-main (<= 1:0.9.8),
         compiz-plugins-main-default (<= 1:0.9.8),
-        compizconfig-backend-gconf (<= 1:0.9.8),
 Description: OpenGL window and compositing manager - GNOME window decorator
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users
@@ -352,12 +350,3 @@
 Description: transitional dummy package
  This package ensures a clean upgrade path, and can be safely removed
  after the upgrade.
-
-Package: compizconfig-backend-gconf
-Depends: compiz-gnome, gconf2, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This package ensures a clean upgrade path, and can be safely removed
- after the upgrade.
-

=== modified file 'debian/rules'
--- debian/rules	2015-10-26 17:15:43 +0000
+++ debian/rules	2015-12-11 09:51:42 +0000
@@ -20,9 +20,9 @@
 override_dh_auto_configure:
         # right now, xorg-gtest won't compile on arm.
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DUSE_GSETTINGS=ON -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF -DUSE_GCONF=OFF -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF
+	dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DUSE_GSETTINGS=ON -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF
 else
-	dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DUSE_GSETTINGS=ON -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF -DUSE_GCONF=OFF
+	dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DUSE_GSETTINGS=ON -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF
 endif
 
 override_dh_install:
@@ -47,9 +47,6 @@
         # remove acceptance test binary
 	rm -f debian/tmp/usr/bin/compiz_autopilot_acceptance_tests
 
-	# remove gconf schema files
-	#rm -rf debian/tmp/usr/share/gconf/schemas/
-
 	# ugly hack to install xml files
 	mkdir -p debian/tmp/usr/share/gnome-control-center/keybindings
 	find */gtk/gnome -name *.xml | xargs cp -at debian/tmp/usr/share/gnome-control-center/keybindings/

=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2015-08-13 22:15:37 +0000
+++ gtk/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -28,7 +28,7 @@
             pkg_check_modules (METACITY libmetacity-private>=3.16.0)
             if (NOT METACITY_FOUND)
                 compiz_set (USE_METACITY 0)
-            endif (METACITY_FOUND)
+            endif (NOT METACITY_FOUND)
         endif (USE_METACITY)
 
 	if (USE_GNOME)

=== modified file 'metadata/CMakeLists.txt'
--- metadata/CMakeLists.txt	2012-07-10 10:35:16 +0000
+++ metadata/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -40,17 +40,6 @@
     DEPENDS ${_core_xml_file}
 )
 
-if (USE_GCONF)
-    compiz_gconf_schema (
-	${_core_xml_file}
-	${CMAKE_BINARY_DIR}/generated/compiz-core.schemas
-	${SCHEMADIR}
-    )
-    add_custom_target (core-gconf-schema ALL
-	DEPENDS ${CMAKE_BINARY_DIR}/generated/compiz-core.schemas
-	        core-xml-file
-    )
-endif ()
 if (USE_GSETTINGS)
     set (_core_gschema_path ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.core.gschema.xml)
     compiz_gsettings_schema (

=== removed file 'plugins/addhelper/Makefile'
--- plugins/addhelper/Makefile	2012-05-16 17:44:43 +0000
+++ plugins/addhelper/Makefile	1970-01-01 00:00:00 +0000
@@ -1,533 +0,0 @@
-##
-#
-# Compiz plugin Makefile
-#
-# Copyright : (C) 2007 by Dennis Kasprzyk
-# E-mail    : [e-mail]
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-##
-
-# plugin.info file contents
-# 
-# PLUGIN = foo
-# PKG_DEP = pango
-# LDFLAGS_ADD = -lGLU
-# CFLAGS_ADD = -I/usr/include/foo
-# CHK_HEADERS = compiz-cube.h
-#
-
-#load config file
-
-ECHO	  = `which echo`
-
-# default color settings
-color := $(shell if [ $$TERM = "dumb" ]; then $(ECHO) "no"; else $(ECHO) "yes"; fi)
-
-ifeq ($(shell if [ -f plugin.info ]; then $(ECHO) -n "found"; fi ),found)
-include plugin.info
-else
-$(error $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\033[1;31m[ERROR]\033[0m \"plugin.info\" file not found"; \
-	else \
-		$(ECHO) "[ERROR] \"plugin.info\" file not found"; \
-	fi;))
-endif
-
-ifneq ($(shell if pkg-config --exists compiz; then $(ECHO) -n "found"; fi ),found)
-$(error $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[1;31m[ERROR]\033[0m Compiz not installed"; \
-	else \
-		$(ECHO) -n "[ERROR] Compiz not installed"; \
-	fi))
-endif
-
-
-ifneq ($(shell if [ -n "$(PKG_DEP)" ]; then if pkg-config --exists $(PKG_DEP); then $(ECHO) -n "found"; fi; \
-       else $(ECHO) -n "found"; fi ),found)
-$(error $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[1;31m[ERROR]\033[0m "; \
-	else \
-		$(ECHO) -n "[ERROR] "; \
-	fi; \
-	pkg-config --print-errors --short-errors --errors-to-stdout $(PKG_DEP); ))
-endif
-
-
-ifeq ($(BUILD_GLOBAL),true)
-	PREFIX = $(shell pkg-config --variable=prefix compiz)
-	CLIBDIR = $(shell pkg-config --variable=libdir compiz)
-	CINCDIR = $(shell pkg-config --variable=includedir compiz)
-	PKGDIR = $(CLIBDIR)/pkgconfig
-	DESTDIR = $(shell pkg-config --variable=libdir compiz)/compiz
-	XMLDIR = $(shell pkg-config --variable=prefix compiz)/share/compiz
-	IMAGEDIR = $(shell pkg-config --variable=prefix compiz)/share/compiz
-	DATADIR = $(shell pkg-config --variable=prefix compiz)/share/compiz
-else
-	DESTDIR = $(HOME)/.compiz/plugins
-	XMLDIR = $(HOME)/.compiz/metadata
-	IMAGEDIR = $(HOME)/.compiz/images
-	DATADIR = $(HOME)/.compiz/data
-endif
-
-BUILDDIR = build
-
-CC        = gcc
-CPP       = g++
-LIBTOOL   = libtool
-INSTALL   = install
-
-BCOP      = `pkg-config --variable=bin bcop`
-
-CFLAGS    = -g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing `pkg-config --cflags $(PKG_DEP) compiz ` $(CFLAGS_ADD)
-LDFLAGS   = `pkg-config --libs $(PKG_DEP) compiz ` $(LDFLAGS_ADD)
-
-DEFINES   = -DIMAGEDIR=\"$(IMAGEDIR)\" -DDATADIR=\"$(DATADIR)\"
-
-POFILEDIR = $(shell if [ -n "$(PODIR)" ]; then $(ECHO) $(PODIR); else $(ECHO) ./po;fi )
-
-COMPIZ_HEADERS = compiz.h compiz-core.h
-COMPIZ_INC = $(shell pkg-config --variable=includedir compiz)/compiz/
-
-is-bcop-target  := $(shell if [ -e $(PLUGIN).xml.in ]; then cat $(PLUGIN).xml.in | grep "useBcop=\"true\""; \
-		     else if [ -e $(PLUGIN).xml ]; then cat $(PLUGIN).xml | grep "useBcop=\"true\""; fi; fi)
-
-trans-target    := $(shell if [ -e $(PLUGIN).xml.in -o -e $(PLUGIN).xml ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml;fi )
-
-bcop-target     := $(shell if [ -n "$(is-bcop-target)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml; fi )
-bcop-target-src := $(shell if [ -n "$(is-bcop-target)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN)_options.c; fi )
-bcop-target-hdr := $(shell if [ -n "$(is-bcop-target)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN)_options.h; fi )
-
-gen-schemas     := $(shell if [ \( -e $(PLUGIN).xml.in -o -e $(PLUGIN).xml \) -a -n "`pkg-config --variable=xsltdir compiz-gconf`" ]; then $(ECHO) true; fi )
-schema-target   := $(shell if [ -n "$(gen-schemas)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml; fi )
-schema-output   := $(shell if [ -n "$(gen-schemas)" ]; then $(ECHO) $(BUILDDIR)/compiz-$(PLUGIN).schema; fi )
-
-ifeq ($(BUILD_GLOBAL),true)
-    pkg-target         := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" ]; then $(ECHO) "$(BUILDDIR)/compiz-$(PLUGIN).pc"; fi )
-    hdr-install-target := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" -a -e compiz-$(PLUGIN).h ]; then $(ECHO) "compiz-$(PLUGIN).h"; fi )
-endif
-
-# find all the object files
-
-c-objs     := $(patsubst %.c,%.lo,$(shell find -name '*.c' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///'))
-c-objs     += $(patsubst %.cpp,%.lo,$(shell find -name '*.cpp' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///'))
-c-objs     += $(patsubst %.cxx,%.lo,$(shell find -name '*.cxx' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///'))
-c-objs     := $(filter-out $(bcop-target-src:.c=.lo),$(c-objs))
-
-h-files    := $(shell find -name '*.h' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///')
-h-files    += $(bcop-target-hdr)
-h-files    += $(foreach file,$(COMPIZ_HEADERS) $(CHK_HEADERS),$(shell $(ECHO) -n "$(COMPIZ_INC)$(file)"))
-
-all-c-objs := $(addprefix $(BUILDDIR)/,$(c-objs)) 
-all-c-objs += $(bcop-target-src:.c=.lo)
-
-# additional files
-
-data-files  := $(shell find data/  -name '*' -type f 2> /dev/null | sed -e 's/data\///')
-image-files := $(shell find images/ -name '*' -type f 2> /dev/null | sed -e 's/images\///')
-
-# system include path parameter, -isystem doesn't work on old gcc's
-inc-path-param = $(shell if [ -z "`gcc --version | head -n 1 | grep ' 3'`" ]; then $(ECHO) "-isystem"; else $(ECHO) "-I"; fi)
-
-# Tests
-ifeq ($(shell if [ -n "$(is-bcop-target)" -a -z "$(BCOP)" ]; then $(ECHO) -n "error"; fi ),error)
-$(error $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[1;31m[ERROR]\033[0m BCOP not installed but is needed to build plugin"; \
-	else \
-		$(ECHO) -n "[ERROR] BCOP not installed but is needed to build plugin"; \
-	fi))
-endif
-
-ifeq ($(shell if [ "x$(BUILD_GLOBAL)" != "xtrue" -a -e compiz-$(PLUGIN).pc.in ]; then $(ECHO) -n "warn"; fi ),warn)
-$(warning $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[1;31m[WARNING]\033[0m This plugin might be needed by other plugins. Install it with \"BUILD_GLOBAL=true sudo make install\" "; \
-	else \
-		$(ECHO) -n "[WARNING]  This plugin might be needed by other plugins. Install it with \"BUILD_GLOBAL=true sudo make install\""; \
-	fi))
-endif
-
-#
-# Do it.
-#
-
-.PHONY: $(BUILDDIR) build-dir trans-target bcop-build pkg-creation schema-creation c-build-objs c-link-plugin
-
-all: $(BUILDDIR) build-dir trans-target bcop-build pkg-creation schema-creation c-build-objs c-link-plugin
-
-trans-build: $(trans-target)
-
-bcop-build:   $(bcop-target-hdr) $(bcop-target-src)
-
-schema-creation: $(schema-output)
-
-c-build-objs: $(all-c-objs)
-
-c-link-plugin: $(BUILDDIR)/lib$(PLUGIN).la
-
-pkg-creation: $(pkg-target)
-
-#
-# Create build directory
-#
-
-$(BUILDDIR) :
-	@mkdir -p $(BUILDDIR)
-
-$(DESTDIR) :
-	@mkdir -p $(DESTDIR)
-
-#
-# fallback if xml.in doesn't exists
-#
-$(BUILDDIR)/%.xml: %.xml
-	@cp $< $@
-
-#
-# Translating
-#
-$(BUILDDIR)/%.xml: %.xml.in
-	@if [ -d $(POFILEDIR) ]; then \
-		if [ '$(color)' != 'no' ]; then \
-			$(ECHO) -e -n "\033[0;1;5mtranslate \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-		else \
-			$(ECHO) "translate $<  ->  $@"; \
-		fi; \
-		intltool-merge -x -u $(POFILEDIR) $< $@ > /dev/null; \
-		if [ '$(color)' != 'no' ]; then \
-			$(ECHO) -e "\r\033[0mtranslate : \033[34m$< -> $@\033[0m"; \
-		fi; \
-	else \
-		if [ '$(color)' != 'no' ]; then \
-			$(ECHO) -e -n "\033[0;1;5mconvert   \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-		else \
-			$(ECHO) "convert   $<  ->  $@"; \
-		fi; \
-		cat $< | sed -e 's;<_;<;g' -e 's;</_;</;g' > $@; \
-		if [ '$(color)' != 'no' ]; then \
-			$(ECHO) -e "\r\033[0mconvert   : \033[34m$< -> $@\033[0m"; \
-		fi; \
-	fi
-
-#
-# BCOP'ing
-
-$(BUILDDIR)/%_options.h: $(BUILDDIR)/%.xml
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mbcop'ing  \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "bcop'ing  $<  ->  $@"; \
-	fi
-	@$(BCOP) --header=$@ $<
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mbcop'ing  : \033[34m$< -> $@\033[0m"; \
-	fi
-
-$(BUILDDIR)/%_options.c: $(BUILDDIR)/%.xml
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mbcop'ing  \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "bcop'ing  $<  ->  $@"; \
-	fi
-	@$(BCOP) --source=$@ $< 
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mbcop'ing  : \033[34m$< -> $@\033[0m"; \
-	fi
-
-#
-# Schema generation
-
-$(BUILDDIR)/compiz-%.schema: $(BUILDDIR)/%.xml
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mschema'ing\033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "schema'ing  $<  ->  $@"; \
-	fi
-	@xsltproc `pkg-config --variable=xsltdir compiz-gconf`/schemas.xslt $< > $@
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mschema    : \033[34m$< -> $@\033[0m"; \
-	fi
-
-#
-# pkg config file generation
-
-$(BUILDDIR)/compiz-%.pc: compiz-%.pc.in
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mpkgconfig \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "pkgconfig   $<  ->  $@"; \
-	fi
-	@COMPIZREQUIRES=`cat $(PKGDIR)/compiz.pc | grep Requires | sed -e 's;Requires: ;;g'`; \
-    COMPIZCFLAGS=`cat $(PKGDIR)/compiz.pc | grep Cflags | sed -e 's;Cflags: ;;g'`; \
-    sed -e 's;@prefix@;$(PREFIX);g' -e 's;\@libdir@;$(CLIBDIR);g' \
-        -e 's;@includedir@;$(CINCDIR);g' -e 's;\@VERSION@;0.0.1;g' \
-        -e "s;@COMPIZ_REQUIRES@;$$COMPIZREQUIRES;g" \
-        -e "s;@COMPIZ_CFLAGS@;$$COMPIZCFLAGS;g" $< > $@;
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mpkgconfig : \033[34m$< -> $@\033[0m"; \
-	fi
-
-#
-# Compiling
-#
-
-$(BUILDDIR)/%.lo: %.c $(h-files)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "compiling $< -> $@"; \
-	fi
-	@$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) $(DEFINES) -I$(BUILDDIR) -c -o $@ $<
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
-	fi
-
-$(BUILDDIR)/%.lo: $(BUILDDIR)/%.c $(h-files)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "compiling $< -> $@"; \
-	fi
-	@$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) $(DEFINES) -I$(BUILDDIR) -c -o $@ $<
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
-	fi
-
-$(BUILDDIR)/%.lo: %.cpp $(h-files)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "compiling $< -> $@"; \
-	fi
-	@$(LIBTOOL) --quiet --mode=compile $(CPP) $(CFLAGS) $(DEFINES) -I$(BUILDDIR) -c -o $@ $<
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
-	fi
-
-$(BUILDDIR)/%.lo: %.cxx $(h-files)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "compiling $< -> $@"; \
-	fi
-	@$(LIBTOOL) --quiet --mode=compile $(CPP) $(CFLAGS) $(DEFINES) -I$(BUILDDIR) -c -o $@ $<
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
-	fi
-
-#
-# Linking
-#
-
-cxx-rpath-prefix := -Wl,-rpath,
-
-$(BUILDDIR)/lib$(PLUGIN).la: $(all-c-objs)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mlinking   \033[0m: \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "linking   : $@"; \
-	fi
-	@$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $(all-c-objs)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mlinking   : \033[34m$@\033[0m"; \
-	fi
-
-
-clean:
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mremoving  \033[0m: \033[0;31m./$(BUILDDIR)\033[0m"; \
-	else \
-		$(ECHO) "removing  : ./$(BUILDDIR)"; \
-	fi
-	@rm -rf $(BUILDDIR)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mremoving  : \033[34m./$(BUILDDIR)\033[0m"; \
-	fi
-	
-
-install: $(DESTDIR) all
-	@if [ '$(color)' != 'no' ]; then \
-	    $(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
-	else \
-	    $(ECHO) "install   : $(DESTDIR)/lib$(PLUGIN).so"; \
-	fi
-	@mkdir -p $(DESTDIR)
-	@$(INSTALL) $(BUILDDIR)/.libs/lib$(PLUGIN).so $(DESTDIR)/lib$(PLUGIN).so
-	@if [ '$(color)' != 'no' ]; then \
-	    $(ECHO) -e "\r\033[0minstall   : \033[34m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
-	fi
-	@if [ -e $(BUILDDIR)/$(PLUGIN).xml ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
-	    else \
-		$(ECHO) "install   : $(XMLDIR)/$(PLUGIN).xml"; \
-	    fi; \
-	    mkdir -p $(XMLDIR); \
-	    $(INSTALL)  $(BUILDDIR)/$(PLUGIN).xml $(XMLDIR)/$(PLUGIN).xml; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0minstall   : \033[34m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(hdr-install-target)" ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
-	    else \
-		$(ECHO) "install   : $(CINCDIR)/compiz/$(hdr-install-target)"; \
-	    fi; \
-	    $(INSTALL) --mode=u=rw,go=r,a-s $(hdr-install-target) $(CINCDIR)/compiz/$(hdr-install-target); \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0minstall   : \033[34m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(pkg-target)" ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
-	    else \
-		$(ECHO) "install   : $(PKGDIR)/compiz-$(PLUGIN).pc"; \
-	    fi; \
-	    $(INSTALL) --mode=u=rw,go=r,a-s $(pkg-target) $(PKGDIR)/compiz-$(PLUGIN).pc; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0minstall   : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(schema-output)" -a -e "$(schema-output)" ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(schema-output)\033[0m"; \
-	    else \
-		$(ECHO) "install   : $(schema-output)"; \
-	    fi; \
-	    if [ "x$(USER)" = "xroot" ]; then \
-		GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-		gconftool-2 --makefile-install-rule $(schema-output) > /dev/null; \
-	    else \
-		gconftool-2 --install-schema-file=$(schema-output) > /dev/null; \
-	    fi; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0minstall   : \033[34m$(schema-output)\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(data-files)" ]; then \
-	    mkdir -p $(DATADIR); \
-	    for FILE in $(data-files); do \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(DATADIR)/$$FILE\033[0m"; \
-		else \
-		    $(ECHO) "install   : $(DATADIR)/$$FILE"; \
-		fi; \
-	    	FILEDIR="$(DATADIR)/`dirname "$$FILE"`"; \
-		mkdir -p "$$FILEDIR"; \
-		$(INSTALL) --mode=u=rw,go=r,a-s data/$$FILE $(DATADIR)/$$FILE; \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -e "\r\033[0minstall   : \033[34m$(DATADIR)/$$FILE\033[0m"; \
-		fi; \
-	    done \
-	fi
-	@if [ -n "$(image-files)" ]; then \
-	    mkdir -p $(IMAGEDIR); \
-	    for FILE in $(image-files); do \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(IMAGEDIR)/$$FILE\033[0m"; \
-		else \
-		    $(ECHO) "install   : $(IMAGEDIR)/$$FILE"; \
-		fi; \
-	    	FILEDIR="$(IMAGEDIR)/`dirname "$$FILE"`"; \
-		mkdir -p "$$FILEDIR"; \
-		$(INSTALL) --mode=u=rw,go=r,a-s images/$$FILE $(IMAGEDIR)/$$FILE; \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -e "\r\033[0minstall   : \033[34m$(IMAGEDIR)/$$FILE\033[0m"; \
-		fi; \
-	    done \
-	fi
-
-uninstall:	
-	@if [ -e $(DESTDIR)/lib$(PLUGIN).so ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(DESTDIR)/lib$(PLUGIN).so"; \
-	    fi; \
-	    rm -f $(DESTDIR)/lib$(PLUGIN).so; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
-	    fi; \
-	fi
-	@if [ -e $(XMLDIR)/$(PLUGIN).xml ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(XMLDIR)/$(PLUGIN).xml"; \
-	    fi; \
-	    rm -f $(XMLDIR)/$(PLUGIN).xml; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(hdr-install-target)" -a -e $(CINCDIR)/compiz/$(hdr-install-target) ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(CINCDIR)/compiz/$(hdr-install-target)"; \
-	    fi; \
-	    rm -f $(CINCDIR)/compiz/$(hdr-install-target); \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(CINCDIR)/compiz/$(hdr-install-target)\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(pkg-target)" -a -e $(PKGDIR)/compiz-$(PLUGIN).pc ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(PKGDIR)/compiz-$(PLUGIN).pc"; \
-	    fi; \
-	    rm -f $(PKGDIR)/compiz-$(PLUGIN).pc; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(schema-output)" -a -e "$(schema-output)" -a 'x$(USER)' = 'xroot' ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(schema-output)\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(schema-output)"; \
-	    fi; \
-	    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-	    gconftool-2 --makefile-uninstall-rule $(schema-output) > /dev/null; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(schema-output)\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(data-files)" ]; then \
-	    for FILE in $(data-files); do \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(DATADIR)/$$FILE\033[0m"; \
-		else \
-		    $(ECHO) "uninstall : $(DATADIR)/$$FILE"; \
-		fi; \
-		rm -f $(DATADIR)/$$FILE; \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -e "\r\033[0muninstall : \033[34m$(DATADIR)/$$FILE\033[0m"; \
-		fi; \
-	    done \
-	fi
-	@if [ -n "$(image-files)" ]; then \
-	    for FILE in $(image-files); do \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(IMAGEDIR)/$$FILE\033[0m"; \
-		else \
-		    $(ECHO) "uninstall : $(IMAGEDIR)/$$FILE"; \
-		fi; \
-		rm -f $(IMAGEDIR)/$$FILE; \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -e "\r\033[0muninstall : \033[34m$(IMAGEDIR)/$$FILE\033[0m"; \
-		fi; \
-	    done \
-	fi

=== removed directory 'tests/migration-scripts'
=== removed file 'tests/migration-scripts/test_migration.py'
--- tests/migration-scripts/test_migration.py	2012-07-27 11:33:39 +0000
+++ tests/migration-scripts/test_migration.py	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2012 Canonical
-#
-# Authors:
-#  Francis 'fginther' Ginther <[e-mail]>
-#  Łukasz 'sil2100' Zemczak <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUTa
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-import sys
-import unittest
-from mock import MagicMock, patch
-from StringIO import StringIO
-
-import gconf
-import glib
-import os.path
-import subprocess
-
-# Module Under Test (mut)
-try:
-    mut = __import__("02_migrate_to_gsettings")
-except (ImportError):
-    sys.exit("Error! 02_migrate_to_gsettings module-under-test not found - perhaps you missed including it in the PYTHONPATH environment variable? Add the migration module directory and re-run the script again.")
-
-class MigrateGconfToGsettingsTests(unittest.TestCase):
-    """Test suite for method migrate_gconf_to_gsettings"""
-
-    def setUp(self):
-        """Redirects stdout so that tests can assert print statements"""
-        self.stdout = sys.stdout
-        self.out = StringIO()
-        sys.stdout = self.out
-
-    def tearDown(self):
-        """Restores stdout"""
-        sys.stdout = self.stdout
-        # Dump the content that was sent to stdout
-        # print(self.out.getvalue())
-
-    def testClientGetDefaultFalse(self):
-        """Test missing gconf client"""
-        gconf.client_get_default = MagicMock(return_value=False)
-        mut.migrate_gconf_to_gsettings()
-        self.assertEqual(self.out.getvalue().strip(), "WARNING: no gconf client found. No transitionning will be done")
-
-    def testGetSchemaException(self):
-        """Test exception handling for get_schema"""
-        gconf_mock = MagicMock(name="gconf-Mock")
-        gconf.client_get_default = MagicMock(return_value=gconf_mock)
-        gconf_schema_mock = MagicMock(name="gconf.Schema-Mock")
-        gconf_mock.get_schema = MagicMock(return_value=gconf_schema_mock,
-                                 side_effect=glib.GError)
-        self.assertRaises(glib.GError, mut.migrate_gconf_to_gsettings())
-
-    def testGetSchemaNone(self):
-        """Test missing schema"""
-        gconf_mock = MagicMock(name="gconf-Mock")
-        gconf.client_get_default = MagicMock(return_value=gconf_mock)
-        #gconf_schema_mock = MagicMock(name="gconf.Schema-Mock")
-        gconf_mock.get_schema = MagicMock(return_value=False)
-        mut.migrate_gconf_to_gsettings()
-        self.assertEqual(self.out.getvalue().strip(), "No current profile set, no migration needed")
-
-    def setupGetSchema(self, profile):
-        """Set up mock objects for testing a valid schema"""
-        # gconf.client_get_default
-        gconf_mock = MagicMock(name="gconf-Mock")
-        gconf.client_get_default = MagicMock(return_value=gconf_mock)
-        # client.get_schema
-        gconf_schema_mock = MagicMock(name="gconf.Schema-Mock")
-        gconf_mock.get_schema = MagicMock(return_value=gconf_schema_mock)
-        # current_profile_schema.get_default_value
-        gconf_gconfvalue_mock = MagicMock(name="gconf.Schema.gconfvalue-Mock")
-        gconf_schema_mock.get_default_value = MagicMock(return_value=gconf_gconfvalue_mock)
-        # current_profile_gconfvalue.get_string
-        gconf_gconfvalue_mock.get_string = MagicMock(return_value=profile)
-
-        # Popen
-        subprocess_mock = MagicMock(name="subprocess-Mock")
-        popen_mock = MagicMock(name="popen-Mock", return_value=subprocess_mock)
-        subprocess.Popen = popen_mock
-        return popen_mock
-
-    def testGetSchemaUnity(self):
-        """Test the 'unity' schema"""
-        popen_mock = self.setupGetSchema("unity")
-        mut.migrate_gconf_to_gsettings()
-        # 2 files should be converted
-        self.assertEqual(len(popen_mock.call_args_list), 2)
-        self.assertEqual(popen_mock.call_args_list[0][0][0][1],
-                         '--file=/usr/lib/compiz/migration/compiz-profile-active-unity.convert')
-        self.assertEqual(popen_mock.call_args_list[1][0][0][1],
-                         '--file=/usr/lib/compiz/migration/compiz-profile-Default.convert')
-
-    def testGetSchemaDefaultConvertPathInvalid(self):
-        """Test the default schema"""
-        popen_mock = self.setupGetSchema("Default")
-        os.path.exists = MagicMock(return_value=False)
-        mut.migrate_gconf_to_gsettings()
-        # 1 file should be converted
-        self.assertEqual(len(popen_mock.call_args_list), 1)
-        self.assertEqual(popen_mock.call_args_list[0][0][0][1],
-                         '--file=/usr/lib/compiz/migration/compiz-profile-active-Default.convert')
-
-    def testGetSchemaDefaultConvertPathValid(self):
-        """Test the default schema with a valid unity convert file"""
-        popen_mock = self.setupGetSchema("Default")
-        exists_mock = MagicMock(return_value=True)
-        os.path.exists = exists_mock
-        mut.migrate_gconf_to_gsettings()
-        self.assertEqual(exists_mock.call_args_list[0][0][0], 
-                         mut.CONVERT_PATH + 'compiz-profile-unity.convert')
-        # 2 files should be converted
-        self.assertEqual(len(popen_mock.call_args_list), 2)
-        self.assertEqual(popen_mock.call_args_list[0][0][0][1],
-                         '--file=/usr/lib/compiz/migration/compiz-profile-active-Default.convert')
-        self.assertEqual(popen_mock.call_args_list[1][0][0][1],
-                         '--file=/usr/lib/compiz/migration/compiz-profile-unity.convert')
-
-
-if __name__ == '__main__':
-    unittest.main()
-

=== modified file 'xslt/CMakeLists.txt'
--- xslt/CMakeLists.txt	2012-09-18 11:32:20 +0000
+++ xslt/CMakeLists.txt	2015-12-11 09:51:42 +0000
@@ -5,10 +5,6 @@
 
 compiz_configure_file (compiz_gsettings_schemas.xslt.in compiz_gsettings_schemas.xslt)
 
-if (USE_GCONF)
-    list (APPEND _files compiz_gconf_schemas.xslt)
-endif ()
-
 if (USE_GSETTINGS)
     list (APPEND _files ${CMAKE_CURRENT_BINARY_DIR}/compiz_gsettings_schemas.xslt)
 endif ()

=== removed file 'xslt/compiz_gconf_schemas.xslt'
--- xslt/compiz_gconf_schemas.xslt	2010-11-26 16:55:31 +0000
+++ xslt/compiz_gconf_schemas.xslt	1970-01-01 00:00:00 +0000
@@ -1,410 +0,0 @@
-<!--
-  Copyright © 2007 Dennis Kasprzyk
-
-  Permission to use, copy, modify, distribute, and sell this software
-  and its documentation for any purpose is hereby granted without
-  fee, provided that the above copyright notice appear in all copies
-  and that both that copyright notice and this permission notice
-  appear in supporting documentation, and that the name of
-  Dennis Kasprzyk not be used in advertising or publicity pertaining to
-  distribution of the software without specific, written prior permission.
-  Dennis Kasprzyk makes no representations about the suitability of this
-  software for any purpose. It is provided "as is" without express or
-  implied warranty.
-
-  DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-  NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-  WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-  Authors: Dennis Kasprzyk <[e-mail]>
--->
-
-<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' >
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:param name="appName">/apps/compiz-1</xsl:param>
-
-  <xsl:template  match="/compiz">
-    <gconfschemafile>
-      <schemalist>
-        <!-- two levels of indentation: group and subgroup>= -->
-        <xsl:for-each select="/compiz//options//option[not(@read_only='true') and not(@type='action')]">
-          <xsl:call-template name="dumpOption"/>
-        </xsl:for-each>
-      </schemalist>
-    </gconfschemafile>
-  </xsl:template>
-
-  <!-- generates the schema for an option -->
-  <xsl:template name="dumpOption">
-    <schema>
-      <key>/schemas<xsl:call-template name="printKey"/></key>
-      <applyto><xsl:call-template name="printKey"/></applyto>
-      <owner>compiz-1</owner>
-      <type><xsl:call-template name="printType"/></type>
-      <xsl:choose>
-        <!-- color values need a special handling -->
-        <xsl:when test="@type = 'color'">
-          <default>
-            <xsl:choose>
-              <xsl:when test="default">
-                <xsl:for-each select="default[1]">
-                  <xsl:call-template name="printColor"/>
-                </xsl:for-each>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>#000000ff</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-          </default>
-        </xsl:when>
-        <xsl:when test="@type = 'edge'">
-          <default>
-            <xsl:call-template name="printEdgeList"/>
-          </default>
-        </xsl:when>
-        <xsl:when test="@type = 'list'">
-          <list_type>
-            <xsl:call-template name="printType">
-              <xsl:with-param name="type" select="type/text()"/>
-            </xsl:call-template>
-          </list_type>
-          <xsl:choose>
-            <xsl:when test="type/text() = 'color'">
-              <default>[<xsl:call-template name="printColorList"/>]</default>
-            </xsl:when>
-            <xsl:otherwise>
-              <default>[<xsl:call-template name="printValueList"/>]</default>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <!-- for most option types we can use the default value directly -->
-        <xsl:otherwise>
-          <default>
-            <xsl:choose>
-              <xsl:when test="default/text()">
-                <xsl:value-of select="default/text()"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <!-- if no default value was specified we need to generate one -->
-                <xsl:choose>
-		  <xsl:when test="contains('bool,bell',@type)">
-                    <xsl:text>false</xsl:text>
-                  </xsl:when>
-                  <xsl:when test="@type = 'int'">
-                    <xsl:variable name="num">
-                      <xsl:call-template name="printNumFallback"/>
-                    </xsl:variable>
-                    <xsl:value-of select="floor($num)"/>
-                  </xsl:when>
-                  <xsl:when test="@type = 'float'">
-                    <xsl:call-template name="printNumFallback"/>
-                  </xsl:when>
-		  <xsl:when test="contains('key,button',@type)">
-		    <xsl:text>Disabled</xsl:text>
-                  </xsl:when>
-                </xsl:choose>
-              </xsl:otherwise>
-            </xsl:choose>
-          </default>
-	</xsl:otherwise>
-      </xsl:choose>
-      <!-- add the short and long descriptions -->
-      <xsl:call-template name="printDescription"/>
-    </schema>
-  </xsl:template>
-
-  <!-- converts a compiz type to a gconf type -->
-  <xsl:template name="printType">
-    <xsl:param name="type">
-      <xsl:value-of select="@type"/>
-    </xsl:param>
-    <xsl:choose>
-      <xsl:when test="$type = 'int'">
-        <xsl:text>int</xsl:text>
-      </xsl:when>
-      <xsl:when test="$type = 'float'">
-        <xsl:text>float</xsl:text>
-      </xsl:when>
-      <xsl:when test="$type = 'bool'">
-        <xsl:text>bool</xsl:text>
-      </xsl:when>
-      <xsl:when test="$type = 'list'">
-        <xsl:text>list</xsl:text>
-      </xsl:when>
-      <xsl:when test="$type = 'bell'">
-        <xsl:text>bool</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>string</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- prints the option long and short descriptions of an option -->
-  <xsl:template name="printDescription">
-    <xsl:param name="info">
-      <xsl:call-template name="printInfo"/>
-    </xsl:param>
-    <locale name="C">
-      <short><xsl:value-of select="short[not(@xml:lang)]/text()"/></short>
-      <long>
-        <xsl:value-of select="long[not(@xml:lang)]/text()"/>
-        <xsl:value-of select="$info"/>
-      </long>
-    </locale>
-    <xsl:for-each select="short[@xml:lang]">
-      <xsl:variable name="language" select="@xml:lang"/>
-      <xsl:variable name="infoTrans">
-        <xsl:call-template name="printInfoTrans">
-          <xsl:with-param name="language" select="$language"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <locale>
-        <xsl:attribute name='name'>
-          <xsl:value-of select="@xml:lang"/>
-        </xsl:attribute>
-        <short><xsl:value-of select="text()"/></short>
-        <long>
-          <xsl:choose>
-            <xsl:when test="parent::option/long[lang($language)]">
-              <xsl:value-of select="parent::option/long[lang($language)]/text()"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="parent::option/long[not(@xml:lang)]/text()"/>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:value-of select="$infoTrans"/>
-        </long>
-      </locale>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- generates the additional info for the long option description -->
-  <xsl:template name="printInfo">
-    <xsl:variable name="info">
-      <xsl:text> (</xsl:text>
-      <xsl:choose>
-        <xsl:when test="contains('int,float',@type) and not(desc/value/text())">
-          <xsl:value-of select="min/text()"/> - <xsl:value-of select="max/text()"/>
-        </xsl:when>
-	<xsl:when test="@type='int' and desc/value/text()">
-          <xsl:call-template name="printIntDescList"/>
-        </xsl:when>
-        <xsl:when test="@type = 'match'">
-          <xsl:text>match</xsl:text>
-        </xsl:when>
-      </xsl:choose>
-      <xsl:text>)</xsl:text>
-    </xsl:variable>
-    <xsl:if test="not(contains($info,' ()'))">
-      <xsl:value-of select="$info"/>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- generates a list of int descriptions -->
-  <xsl:template name="printIntDescList">
-    <xsl:variable name="list">
-      <xsl:for-each select="desc">
-          <xsl:value-of select="value/text()"/>
-	  <xsl:text> = </xsl:text>
-	  <xsl:value-of select="name/text()"/>
-          <xsl:text>, </xsl:text>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:value-of select="substring($list,1,string-length($list) - 2)"/>
-  </xsl:template>
-
-   <!-- generates the additional info for the long option description -->
-  <xsl:template name="printInfoTrans">
-    <xsl:param name="language"/>
-    <xsl:variable name="info">
-      <xsl:text> (</xsl:text>
-      <xsl:choose>
-        <xsl:when test="contains('int,float',parent::option/@type) and not(parent::option/desc/value/text())">
-          <xsl:value-of select="parent::option/min/text()"/> - <xsl:value-of select="parent::option/max/text()"/>
-        </xsl:when>
-	<xsl:when test="parent::option/@type='int' and parent::option/desc/value/text()">
-          <xsl:call-template name="printIntDescListTrans">
-            <xsl:with-param name="language" select="$language"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="parent::option/@type = 'match'">
-          <xsl:text>match</xsl:text>
-        </xsl:when>
-      </xsl:choose>
-      <xsl:text>)</xsl:text>
-    </xsl:variable>
-    <xsl:if test="not(contains($info,' ()'))">
-      <xsl:value-of select="$info"/>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- generates a list of int descriptions -->
-  <xsl:template name="printIntDescListTrans">
-    <xsl:param name="language"/>
-    <xsl:variable name="list">
-      <xsl:for-each select="parent::option/desc">
-          <xsl:value-of select="value/text()"/>
-          <xsl:text> = </xsl:text>
-          <xsl:choose>
-            <xsl:when test="name[lang($language)]/text()">
-              <xsl:value-of select="name[lang($language)]/text()"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="name[not(@xml:lang)]/text()"/>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:text>, </xsl:text>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:value-of select="substring($list,1,string-length($list) - 2)"/>
-  </xsl:template>
-
-  <!-- generates a default number out of the min and max values -->
-  <xsl:template name="printNumFallback">
-    <xsl:choose>
-      <xsl:when test="max/text() and min/text()">
-        <xsl:value-of select="(max/text() + min/text()) div 2"/>
-      </xsl:when>
-      <xsl:when test="max/text() and not(min/text())">
-        <xsl:value-of select="max/text()"/>
-      </xsl:when>
-      <xsl:when test="not(max/text()) and min/text()">
-        <xsl:value-of select="min/text()"/>
-      </xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- generates a list of values -->
-  <xsl:template name="printValueList">
-    <xsl:variable name="list">
-      <xsl:for-each select="default/value">
-        <xsl:value-of select="text()"/>
-        <xsl:text>,</xsl:text>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:value-of select="substring($list,1,string-length($list) - 1)"/>
-  </xsl:template>
-
-  <!-- generates a list of color string values -->
-  <xsl:template name="printColorList">
-    <xsl:variable name="list">
-      <xsl:for-each select="default/value">
-        <xsl:call-template name="printColor"/>
-        <xsl:text>,</xsl:text>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:value-of select="substring($list,1,string-length($list) - 1)"/>
-  </xsl:template>
-
-  <!--
-    generates the #00aabbcc color value out of the compiz
-    metadata color description
-  -->
-  <xsl:template name="printColor">
-    <xsl:variable name="red">
-      <xsl:call-template name="getHexNum">
-        <xsl:with-param name="value" select="red/text()"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="green">
-      <xsl:call-template name="getHexNum">
-        <xsl:with-param name="value" select="green/text()"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="blue">
-      <xsl:call-template name="getHexNum">
-        <xsl:with-param name="value" select="blue/text()"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="alpha">
-      <xsl:choose>
-        <xsl:when test="alpha/text()">
-	  <xsl:call-template name="getHexNum">
-            <xsl:with-param name="value" select="alpha/text()"/>
-	  </xsl:call-template>
-        </xsl:when>
-	<xsl:otherwise>
-          <xsl:text>ff</xsl:text>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:value-of select="concat('#',concat($red,concat($green,concat($blue,$alpha))))"/>
-  </xsl:template>
-
-  <!--
-    converts a decimal number in the range of 0-65535 or
-    a hex number in the range of 0x0000 - 0xffff to a hex number in the
-    range of 00 - ff
-  -->
-  <xsl:template name="getHexNum">
-    <xsl:param name="value"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($value,'0x')">
-        <xsl:variable name="number">
-          <xsl:text>0000</xsl:text>
-          <xsl:value-of select="substring-after($value,'0x')"/>
-        </xsl:variable>
-        <xsl:value-of select="substring(concat('000',$number),string-length($number),2)"/>
-      </xsl:when>
-      <xsl:when test="string-length($value)">
-        <xsl:variable name="number">
-          <xsl:call-template name="toHex">
-            <xsl:with-param name="decimalNumber" select="$value"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="substring(concat('000',$number),string-length($number),2)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>00</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- generates a list of selected edges -->
-  <xsl:template name="printEdgeList">
-    <xsl:variable name="list">
-      <xsl:for-each select="default/edge">
-        <xsl:value-of select="@name"/>
-        <xsl:text> | </xsl:text>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:value-of select="substring($list,1,string-length($list) - 3)"/>
-  </xsl:template>
-
-  <!-- prints the key path for an option -->
-  <xsl:template name="printKey">
-    <xsl:value-of select="$appName"/>
-    <xsl:choose>
-      <xsl:when test="ancestor::plugin">
-        <xsl:text>/plugins/</xsl:text>
-        <xsl:value-of select="ancestor::plugin/@name"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>/general</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>/screen0/options/</xsl:text>
-    <xsl:value-of select="@name"/>
-  </xsl:template>
-
-  <!-- converts a decimal number to a hex number -->
-  <xsl:variable name="hexDigits" select="'0123456789abcdef'" />
-
-  <xsl:template name="toHex">
-    <xsl:param name="decimalNumber" />
-    <xsl:if test="$decimalNumber >= 16">
-      <xsl:call-template name="toHex">
-        <xsl:with-param name="decimalNumber" select="floor($decimalNumber div 16)" />
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:value-of select="substring($hexDigits, ($decimalNumber mod 16) + 1, 1)" />
-  </xsl:template>
-
-</xsl:stylesheet>