CMakeLists.txt | 23
Makefile.am | 7
NEWS | 15
VERSION | 2
autogen.sh | 16
configure.ac | 84 -
debian/changelog | 17
debian/compat | 2
debian/control | 11
debian/copyright | 4
debian/install | 1
debian/rules | 74 -
debian/source/format | 1
debian/source/local-options | 2
debian/watch | 4
settings-backend/Makefile.am | 14
settings-backend/gconf.c | 2070 ------------------------------------------
src/gconf.c | 2108 +++++++++++++++++++++++++++++++++++++++++++
18 files changed, 2190 insertions(+), 2265 deletions(-)
New commits:
commit db10ac36078a5dcdde0d5f872d5eb033792df4cd
Author: Sean Finney <sean...@debian.org>
Date: Sun Feb 27 10:38:53 2011 +0000
update debian/copyright
diff --git a/debian/copyright b/debian/copyright
index 12db44a..7dbd7ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,10 @@ This package was debianized by Sean Finney
<sean...@debian.org>.
It was downloaded from
git://anongit.compiz-fusion.org/fusion/compizconfig/compizconfig-backend-gconf
+ * Copyright (c) 2006 Robert Carr <rac...@opencompositing.org>
+ * Copyright (c) 2007 Danny Baumann <man...@opencompositing.org>
+ * Copyright (c) 2007 Dennis Kasprzyk <onest...@opencompositing.org>
+
Upstream Authors (Lead Developers, see AUTHORS for full list):
Danny Baumann <dannybaum...@web.de>
commit c7ab6cd52ef8b9467092c755bbc062cb233289dd
Author: Sean Finney <sean...@debian.org>
Date: Sun Feb 27 10:31:59 2011 +0000
add unapply-patches and abort-on-upstream-changes to local-options
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
commit 0a4c862b6feb1941bbaab36eca8cd06430ecbb30
Author: Sean Finney <sean...@debian.org>
Date: Sun Feb 27 10:31:35 2011 +0000
Incorporate Janos' packaging work
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 46a969d..edd14eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,12 @@ Source: compizconfig-backend-gconf
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Sean Finney <sean...@debian.org>
-Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev,
compiz-dev (>= 0.8.4), intltool, libcompizconfig-dev (>= 0.8.4),
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.0.50~), cmake, intltool, pkg-config, libtool,
+ compiz-dev (>= 0.9.0), libcompizconfig-dev (>= 0.9.0), libglib2.0-dev,
+ libgconf2-dev, libxslt1-dev, libxml2-dev
+Standards-Version: 3.9.1
Section: x11
+Homepage: http://www.compiz.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-gconf.git
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.git
@@ -16,7 +19,7 @@ Description: Compiz Fusion configuration system - gconf
backend
and the community around the Compiz Window Manager. It seeks to provide
an easy and fun-to-use windowing environment, allowing use of the
graphics hardware to provide impressive effects, amazing speed and
- unrivalled usefulness
+ unrivalled usefulness.
.
This package provides the gconf-based configuration backend for the
- compiz-fusion plugin system
+ compiz-fusion plugin system.
diff --git a/debian/install b/debian/install
deleted file mode 100644
index b73f6a0..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/compizconfig/backends/*.so
diff --git a/debian/rules b/debian/rules
index 69e92c1..5b62395 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,73 +4,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+CORE_ABIVERSION := $(shell sed -rn
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p'
/usr/include/compiz/core/core.h )
-AUTOFOO_DELETE:=Makefile.in aclocal.m4 config.guess config.sub configure \
- depcomp install-sh intltool-extract.in intltool-merge.in \
- intltool-update.in ltmain.sh missing mkinstalldirs \
- settings-backend/Makefile.in po
+%:
+ dh $@
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- ./autogen.sh --prefix=/usr --disable-static
- touch configure-stamp
+override_dh_auto_configure:
+ dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE
-DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f build-stamp configure-stamp
- rm -rf $(AUTOFOO_DELETE)
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- # clean up some upstream cruft
- find $(CURDIR)/debian/tmp -type f -name '*.la' -print0 | xargs -0 rm -f
- rm -rf $(CURDIR)/debian/tmp/usr/lib/pkgconfig
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# uncomment when upstream starts putting stuff in it
-# dh_installchangelogs ChangeLog
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install --sourcedir=debian/tmp --fail-missing
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_gencontrol:
+ dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..2c8cc08
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+http://releases.compiz.org/([\d\.]+)[\d]/
compizconfig-backend-gconf-([\d\.]+)\.tar\.gz
+
+
commit ec0dae80561cd4febf631139cb22892b4e0ca7a0
Author: Sean Finney <sean...@debian.org>
Date: Sun Feb 27 10:29:50 2011 +0000
Prepare changelog for next upload
diff --git a/debian/changelog b/debian/changelog
index 86dd3a0..ef1283e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+compizconfig-backend-gconf (0.9.2.1+git20110226.g861a1d4-1) experimental;
urgency=low
+
+ * Incorporate Janos Guljas' compiz packaging work, thanks!
+
+ -- Sean Finney <sean...@debian.org> Sun, 27 Feb 2011 10:28:35 +0000
+
+compizconfig-backend-gconf (0.9.2.1-1.1) unstable; urgency=low
+
+ [ Janos Guljas ]
+ * New upstream release.
+ * Bump standards to 3.9.1.
+ * Rewrite debian/rules to use debhelper 7.
+ * Switch to dpkg version 3.0 (quilt).
+ * Added debian/watch file.
+
+ -- Janos Guljas <ja...@resenje.org> Mon, 15 Nov 2010 15:47:05 +0100
+
compizconfig-backend-gconf (0.8.4-1) unstable; urgency=low
* New upstream release.
commit 861a1d44b2041d760226ffc2e7d8f62f4afd4d0d
Author: Sam Spilsbury <smspillaz@XPS-UNITY.(none)>
Date: Mon Dec 13 05:09:28 2010 +0800
Fix branch confusion
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67f4ffa..0ab43d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,157 +4,7 @@ find_package (CompizConfig REQUIRED)
include (LibCompizConfigCommon)
-# Generate GConf Schemas for existing installed plugins
-
-set (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS 1 CACHE BOOL "Generate GConf
schemas for existing plugins")
-
-if (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS)
- pkg_check_modules (GCONF gconf-2.0)
-
- find_program (GCONFTOOL_EXECUTABLE gconftool-2)
- mark_as_advanced (FORCE GCONFTOOL_EXECUTABLE)
- set (COMPIZ_GCONF_SCHEMAS_XSLT
"${CMAKE_SOURCE_DIR}/xslt/compiz_gconf_schemas.xslt")
-
- 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 (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS 0)
- else ()
- 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 _name)
- 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 "${COMPIZ_DESTDIR}${_dst}"
- RENAME "${_name}"
- )
- endfunction ()
-
- # generate gconf schema
- function (compiz_gconf_schema _src _dst _inst _name)
- 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} ${_name})
- endif ()
- endfunction ()
-
- # generate schemas for existing plugins in compiz prefix
-
- file (GLOB _compiz_schema_files "${COMPIZ_PREFIX}/share/compiz/*.xml")
- foreach (_file ${_compiz_schema_files})
- string (LENGTH "${COMPIZ_PREFIX}/share/compiz/" _dir_len)
- string (LENGTH ${_file} _path_len)
-
- math (EXPR _file_len "${_path_len} - ${_dir_len}")
- math (EXPR _plugin_name_len "${_file_len} - 4")
-
- string (SUBSTRING ${_file} ${_dir_len} ${_file_len} _plugin_name)
- string (SUBSTRING ${_plugin_name} 0 ${_plugin_name_len}
_plugin_name)
- 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)
- compiz_gconf_schema (${_file}
"${CMAKE_BINARY_DIR}/generated/compiz-${_plugin_name}.schemas"
- ${PLUGIN_SCHEMADIR}
compiz-${_plugin_name}.schemas)
- list (APPEND _gconf_files_add
"${CMAKE_BINARY_DIR}/generated/compiz-${_plugin_name}.schemas")
- endforeach ()
-
- # generate schemas for existing plugins in package prefix
-
- file (GLOB _compiz_schema_files "${datadir}/compiz/*.xml")
- foreach (_file ${_compiz_schema_files})
- string (LENGTH "${datadir}/compiz/" _dir_len)
- string (LENGTH ${_file} _path_len)
-
- math (EXPR _file_len "${_path_len} - ${_dir_len}")
- math (EXPR _plugin_name_len "${_file_len} - 4")
-
- string (SUBSTRING ${_file} ${_dir_len} ${_file_len} _plugin_name)
- string (SUBSTRING ${_plugin_name} 0 ${_plugin_name_len}
_plugin_name)
-
- 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)
-
- compiz_gconf_schema (${_file}
"${CMAKE_BINARY_DIR}/generated/package-${_plugin_name}.schemas"
- ${PLUGIN_SCHEMADIR}
compiz-${_plugin_name}.schemas)
- list (APPEND _gconf_files_add
"${CMAKE_BINARY_DIR}/generated/package-${_plugin_name}.schemas")
- endforeach ()
-
- # generate schemas for existing plugins in local prefix
-
- file (GLOB _compiz_schema_files "$ENV{HOME}/.compiz-1/metadata/*.xml")
- foreach (_file ${_compiz_schema_files})
- string (LENGTH "$ENV{HOME}/.compiz-1/metadata/" _dir_len)
- string (LENGTH ${_file} _path_len)
-
- math (EXPR _file_len "${_path_len} - ${_dir_len}")
- math (EXPR _plugin_name_len "${_file_len} - 4")
-
- string (SUBSTRING ${_file} ${_dir_len} ${_file_len} _plugin_name)
- string (SUBSTRING ${_plugin_name} 0 ${_plugin_name_len}
_plugin_name)
-
- 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)
-
- compiz_gconf_schema (${_file}
"${CMAKE_BINARY_DIR}/generated/local-${_plugin_name}.schemas"
- ${PLUGIN_SCHEMADIR}
compiz-${_plugin_name}.schemas)
- list (APPEND _gconf_files_add
"${CMAKE_BINARY_DIR}/generated/local-${_plugin_name}.schemas")
- endforeach ()
-
- endif ()
-endif ()
-
-compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0 FILESADD
${_gconf_files_add})
-
-add_subdirectory (xslt)
-add_subdirectory (cmake)
+compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0)
# compizconfig-gconf package version number
# An odd micro number indicates in-progress development.
@@ -166,9 +16,6 @@ set (COMPIZCONFIG_GCONF_VERSION_MACRO 1)
set (VERSION
${COMPIZCONFIG_GCONF_VERSION_MAJOR}.${COMPIZCONFIG_GCONF_VERSION_MINOR}.${COMPIZCONFIG_GCONF_VERSION_MICRO}.${COMPIZCONFIG_GCONF_VERSION_MACRO})
compiz_print_configure_header ("CompizConfig GConf Storage Backend")
-compiz_color_message ("\n${_escape}[4mOptional features:${_escape}[0m\n")
-
-compiz_print_result_message ("generate schemas for existing plugins"
GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS)
compiz_print_configure_footer ()
compiz_add_uninstall ()
commit 9e2664b3c1544f23d7db21c99bd11287fca20b35
Author: Sam Spilsbury <sam.spilsb...@canonical.com>
Date: Fri Dec 10 21:52:17 2010 +0800
Add multiscreen support
diff --git a/src/gconf.c b/src/gconf.c
index 4cb7aaa..06d1e9f 100644
--- a/src/gconf.c
+++ b/src/gconf.c
@@ -57,11 +57,6 @@
#define DEFAULTPROF "Default"
#define CORE_NAME "core"
-/* HACK: Really we should support multiple screens, but this would
- * require some work elsewhere so lets leave it at zero for now */
-
-#define DEFAULT_SCREEN_NUM 0
-
#define BUFSIZE 512
#define KEYNAME(sn) char keyName[BUFSIZE]; \
@@ -1136,7 +1131,7 @@ readOption (CCSSetting * setting)
Bool ret = FALSE;
Bool valid = TRUE;
- KEYNAME(DEFAULT_SCREEN_NUM);
+ KEYNAME(setting->parent->context->screenNum);
PATHNAME;
/* first check if the key is set */
@@ -1678,7 +1673,7 @@ writeIntegratedOption (CCSContext *context,
static void
resetOptionToDefault (CCSSetting * setting)
{
- KEYNAME (DEFAULT_SCREEN_NUM);
+ KEYNAME (setting->parent->context->screenNum);
PATHNAME;
gconf_client_recursive_unset (client, pathName, 0, NULL);
@@ -1688,7 +1683,7 @@ resetOptionToDefault (CCSSetting * setting)
static void
writeOption (CCSSetting * setting)
{
- KEYNAME (DEFAULT_SCREEN_NUM);
+ KEYNAME (setting->parent->context->screenNum);
PATHNAME;
switch (setting->type)
commit b40d06f3023a031a1a32ecc0d3d5644a91b83f36
Author: Sam Spilsbury <sam.spilsb...@canonical.com>
Date: Fri Dec 10 21:41:31 2010 +0800
Fix setting /allscreens, we should set /screen%i (defaults to screen 0)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab43d0..67f4ffa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,157 @@ find_package (CompizConfig REQUIRED)
include (LibCompizConfigCommon)
-compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0)
+# Generate GConf Schemas for existing installed plugins
+
+set (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS 1 CACHE BOOL "Generate GConf
schemas for existing plugins")
+
+if (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS)
+ pkg_check_modules (GCONF gconf-2.0)
+
+ find_program (GCONFTOOL_EXECUTABLE gconftool-2)
+ mark_as_advanced (FORCE GCONFTOOL_EXECUTABLE)
+ set (COMPIZ_GCONF_SCHEMAS_XSLT
"${CMAKE_SOURCE_DIR}/xslt/compiz_gconf_schemas.xslt")
+
+ 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 (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS 0)
+ else ()
+ 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 _name)
+ 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 "${COMPIZ_DESTDIR}${_dst}"
+ RENAME "${_name}"
+ )
+ endfunction ()
+
+ # generate gconf schema
+ function (compiz_gconf_schema _src _dst _inst _name)
+ 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} ${_name})
+ endif ()
+ endfunction ()
+
+ # generate schemas for existing plugins in compiz prefix
+
+ file (GLOB _compiz_schema_files "${COMPIZ_PREFIX}/share/compiz/*.xml")
+ foreach (_file ${_compiz_schema_files})
+ string (LENGTH "${COMPIZ_PREFIX}/share/compiz/" _dir_len)
+ string (LENGTH ${_file} _path_len)
+
+ math (EXPR _file_len "${_path_len} - ${_dir_len}")
+ math (EXPR _plugin_name_len "${_file_len} - 4")
+
+ string (SUBSTRING ${_file} ${_dir_len} ${_file_len} _plugin_name)
+ string (SUBSTRING ${_plugin_name} 0 ${_plugin_name_len}
_plugin_name)
+ 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)
+ compiz_gconf_schema (${_file}
"${CMAKE_BINARY_DIR}/generated/compiz-${_plugin_name}.schemas"
+ ${PLUGIN_SCHEMADIR}
compiz-${_plugin_name}.schemas)
+ list (APPEND _gconf_files_add
"${CMAKE_BINARY_DIR}/generated/compiz-${_plugin_name}.schemas")
+ endforeach ()
+
+ # generate schemas for existing plugins in package prefix
+
+ file (GLOB _compiz_schema_files "${datadir}/compiz/*.xml")
+ foreach (_file ${_compiz_schema_files})
+ string (LENGTH "${datadir}/compiz/" _dir_len)
+ string (LENGTH ${_file} _path_len)
+
+ math (EXPR _file_len "${_path_len} - ${_dir_len}")
+ math (EXPR _plugin_name_len "${_file_len} - 4")
+
+ string (SUBSTRING ${_file} ${_dir_len} ${_file_len} _plugin_name)
+ string (SUBSTRING ${_plugin_name} 0 ${_plugin_name_len}
_plugin_name)
+
+ 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)
+
+ compiz_gconf_schema (${_file}
"${CMAKE_BINARY_DIR}/generated/package-${_plugin_name}.schemas"
+ ${PLUGIN_SCHEMADIR}
compiz-${_plugin_name}.schemas)
+ list (APPEND _gconf_files_add
"${CMAKE_BINARY_DIR}/generated/package-${_plugin_name}.schemas")
+ endforeach ()
+
+ # generate schemas for existing plugins in local prefix
+
+ file (GLOB _compiz_schema_files "$ENV{HOME}/.compiz-1/metadata/*.xml")
+ foreach (_file ${_compiz_schema_files})
+ string (LENGTH "$ENV{HOME}/.compiz-1/metadata/" _dir_len)
+ string (LENGTH ${_file} _path_len)
+
+ math (EXPR _file_len "${_path_len} - ${_dir_len}")
+ math (EXPR _plugin_name_len "${_file_len} - 4")
+
+ string (SUBSTRING ${_file} ${_dir_len} ${_file_len} _plugin_name)
+ string (SUBSTRING ${_plugin_name} 0 ${_plugin_name_len}
_plugin_name)
+
+ 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)
+
+ compiz_gconf_schema (${_file}
"${CMAKE_BINARY_DIR}/generated/local-${_plugin_name}.schemas"
+ ${PLUGIN_SCHEMADIR}
compiz-${_plugin_name}.schemas)
+ list (APPEND _gconf_files_add
"${CMAKE_BINARY_DIR}/generated/local-${_plugin_name}.schemas")
+ endforeach ()
+
+ endif ()
+endif ()
+
+compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0 FILESADD
${_gconf_files_add})
+
+add_subdirectory (xslt)
+add_subdirectory (cmake)
# compizconfig-gconf package version number
# An odd micro number indicates in-progress development.
@@ -16,6 +166,9 @@ set (COMPIZCONFIG_GCONF_VERSION_MACRO 1)
set (VERSION
${COMPIZCONFIG_GCONF_VERSION_MAJOR}.${COMPIZCONFIG_GCONF_VERSION_MINOR}.${COMPIZCONFIG_GCONF_VERSION_MICRO}.${COMPIZCONFIG_GCONF_VERSION_MACRO})
compiz_print_configure_header ("CompizConfig GConf Storage Backend")
+compiz_color_message ("\n${_escape}[4mOptional features:${_escape}[0m\n")
+
+compiz_print_result_message ("generate schemas for existing plugins"
GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS)
compiz_print_configure_footer ()
compiz_add_uninstall ()
diff --git a/src/gconf.c b/src/gconf.c
index 400ce18..4cb7aaa 100644
--- a/src/gconf.c
+++ b/src/gconf.c
@@ -57,10 +57,15 @@
#define DEFAULTPROF "Default"
#define CORE_NAME "core"
+/* HACK: Really we should support multiple screens, but this would
+ * require some work elsewhere so lets leave it at zero for now */
+
+#define DEFAULT_SCREEN_NUM 0
+
#define BUFSIZE 512
-#define KEYNAME char keyName[BUFSIZE]; \
- snprintf (keyName, BUFSIZE, "allscreens");
+#define KEYNAME(sn) char keyName[BUFSIZE]; \
+ snprintf (keyName, BUFSIZE, "screen%i", sn);
#define PATHNAME char pathName[BUFSIZE]; \
if (!setting->parent->name || \
@@ -474,13 +479,8 @@ valueChanged (GConfClient *client,
if (!token)
return;
- if (strcmp (token, "allscreens") == 0)
- isScreen = FALSE;
- else
- {
- isScreen = TRUE;
- sscanf (token, "screen%d", &screenNum);
- }
+ isScreen = TRUE;
+ sscanf (token, "screen%d", &screenNum);
token = strsep (&keyName, "/"); /* 'options' */
if (!token)
@@ -1136,7 +1136,7 @@ readOption (CCSSetting * setting)
Bool ret = FALSE;
Bool valid = TRUE;
- KEYNAME;
+ KEYNAME(DEFAULT_SCREEN_NUM);
PATHNAME;
/* first check if the key is set */
@@ -1678,7 +1678,7 @@ writeIntegratedOption (CCSContext *context,
static void
resetOptionToDefault (CCSSetting * setting)
{
- KEYNAME;
+ KEYNAME (DEFAULT_SCREEN_NUM);
PATHNAME;
gconf_client_recursive_unset (client, pathName, 0, NULL);
@@ -1688,7 +1688,7 @@ resetOptionToDefault (CCSSetting * setting)
static void
writeOption (CCSSetting * setting)
{
- KEYNAME;
+ KEYNAME (DEFAULT_SCREEN_NUM);
PATHNAME;
switch (setting->type)
commit 55a267f14038b2507abb743de432ccbfd729a4bb
Author: Didier Roche <didro...@ubuntu.com>
Date: Fri Nov 26 14:33:13 2010 +0100
fix schema owner and typo
diff --git a/src/gconf.c b/src/gconf.c
index 400ce18..a39acb0 100644
--- a/src/gconf.c
+++ b/src/gconf.c
@@ -1829,7 +1829,7 @@ updateCurrentProfileName (char *profile)
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");
+ gconf_schema_set_owner (schema, "compizconfig-1");
gconf_value_set_string (value, profile);
gconf_schema_set_default_value (schema, value);
@@ -1902,7 +1902,7 @@ checkProfile (CCSContext *context)
{
copyGconfTree (context, pathName, COMPIZ, FALSE, NULL);
- /* delete the new profile tree in /apps/compiz-1config
+ /* delete the new profile tree in /apps/compizconfig-1
to avoid user modification in the wrong tree */
copyGconfTree (context, pathName, NULL, TRUE, NULL);
free (pathName);
commit 26440eb73a49b339e27398d9c8f151a53f490106
Author: Sam Spilsbury <sam.spilsb...@canonical.com>
Date: Tue Nov 23 02:51:59 2010 +0800
Change paths so that old and new settings don't conflict
diff --git a/src/gconf.c b/src/gconf.c
index 00e0ce2..400ce18 100644
--- a/src/gconf.c
+++ b/src/gconf.c
@@ -51,8 +51,8 @@
#define CompScrollLockMask (1 << 22)
#define METACITY "/apps/metacity"
-#define COMPIZ "/apps/compiz"
-#define COMPIZCONFIG "/apps/compizconfig"
+#define COMPIZ "/apps/compiz-1"
+#define COMPIZCONFIG "/apps/compizconfig-1"
#define PROFILEPATH COMPIZCONFIG "/profiles"
#define DEFAULTPROF "Default"
#define CORE_NAME "core"
@@ -1883,7 +1883,7 @@ checkProfile (CCSContext *context)
if (lastProfile)
{
- /* copy /apps/compiz tree to profile path */
+ /* copy /apps/compiz-1 tree to profile path */
asprintf (&pathName, "%s/%s", PROFILEPATH, lastProfile);
if (pathName)
{
@@ -1893,16 +1893,16 @@ checkProfile (CCSContext *context)
}
}
- /* reset /apps/compiz tree */
+ /* reset /apps/compiz-1 tree */
gconf_client_recursive_unset (client, COMPIZ, 0, NULL);
- /* copy new profile tree to /apps/compiz */
+ /* copy new profile tree to /apps/compiz-1 */
asprintf (&pathName, "%s/%s", PROFILEPATH, currentProfile);
if (pathName)
{
copyGconfTree (context, pathName, COMPIZ, FALSE, NULL);
- /* delete the new profile tree in /apps/compizconfig
+ /* delete the new profile tree in /apps/compiz-1config
to avoid user modification in the wrong tree */
copyGconfTree (context, pathName, NULL, TRUE, NULL);
free (pathName);
commit dd1abd3bc425c2f65cce23a868043ca10ae177a2
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sat Nov 6 20:48:51 2010 +0800
Update NEWS for 0.9.2.1 Release
diff --git a/NEWS b/NEWS
index 9c4521d..2b4b2ee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,3 @@
-Release 0.9.2 (2010-11-06 Sam Spilsbury <sam.spilsb...@canonical.com>)
-=====================================================================
-Bugfix release.
-
Release 0.9.0 (2010-07-03 Sam Spilsbury <smspil...@gmail.com>)
==============================================================
Development release.
@@ -13,3 +9,7 @@ Added CMake Buildsystem.
Release 0.9.2 (2010-10-24 Sam Spilsbury <smspil...@gmail.com>)
==============================================================
Development release.
+
+Release 0.9.2.1 (2010-11-06 Sam Spilsbury <sam.spilsb...@canonical.com>)
+========================================================================
+Bugfix release.
commit b1575e20e5eeb5050981ab11d504074fe95cbdfc
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sat Nov 6 20:47:05 2010 +0800
Update NEWS for 0.9.2.1 Release
diff --git a/NEWS b/NEWS
index 4db2b58..9c4521d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 0.9.2 (2010-11-06 Sam Spilsbury <sam.spilsb...@canonical.com>)
+=====================================================================
+Bugfix release.
+
Release 0.9.0 (2010-07-03 Sam Spilsbury <smspil...@gmail.com>)
==============================================================
Development release.
commit ec2ae9d05e464323eb1abb5493a7d8e372b0a23e
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sat Nov 6 20:42:08 2010 +0800
Set COMPIZCONFIG_GCONF_VERSION_MACRO and update to 0.9.2.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a2ba33..0ab43d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,9 @@ compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0)
# An even micro number indicates a released version.
set (COMPIZCONFIG_GCONF_VERSION_MAJOR 0)
set (COMPIZCONFIG_GCONF_VERSION_MINOR 9)
-set (COMPIZCONFIG_GCONF_VERSION_MICRO 0)
-set (VERSION
${COMPIZCONFIG_GCONF_VERSION_MAJOR}.${COMPIZCONFIG_GCONF_VERSION_MINOR}.${COMPIZCONFIG_GCONF_VERSION_MICRO})
+set (COMPIZCONFIG_GCONF_VERSION_MICRO 2)
+set (COMPIZCONFIG_GCONF_VERSION_MACRO 1)
+set (VERSION
${COMPIZCONFIG_GCONF_VERSION_MAJOR}.${COMPIZCONFIG_GCONF_VERSION_MINOR}.${COMPIZCONFIG_GCONF_VERSION_MICRO}.${COMPIZCONFIG_GCONF_VERSION_MACRO})
compiz_print_configure_header ("CompizConfig GConf Storage Backend")
compiz_print_configure_footer ()
commit b970dd24c945b79afab19bfe9a9ee9ee9b7387e0
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sat Nov 6 20:41:23 2010 +0800
Update to 0.9.2.1
diff --git a/VERSION b/VERSION
index f626ec2..5d08606 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.9.0
+VERSION=0.9.2.1
commit c6aad98e3d72006b80fadcffc502823e4342194d
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sun Oct 24 22:51:36 2010 +0800
Fix date on NEWS
diff --git a/NEWS b/NEWS
index 13f5420..4db2b58 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,6 @@ Removed multiscreen support to reflect core API changes.
Added CMake Buildsystem.
-Release 0.9.2 (2010-07-03 Sam Spilsbury <smspil...@gmail.com>)
+Release 0.9.2 (2010-10-24 Sam Spilsbury <smspil...@gmail.com>)
==============================================================
Development release.
commit d74ec0d2ea8ee74b6ccf44b97adb05147da5a374
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sun Oct 24 22:48:56 2010 +0800
Update NEWS for 0.9.2 release
diff --git a/NEWS b/NEWS
index 7bc795d..13f5420 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ Release 0.9.0 (2010-07-03 Sam Spilsbury <smspil...@gmail.com>)
==============================================================
Development release.
-CMake Buildsystem.
+Removed multiscreen support to reflect core API changes.
-Adjust for libcompizconfig API changes.
\ No newline at end of file
+Added CMake Buildsystem.
+
+Release 0.9.2 (2010-07-03 Sam Spilsbury <smspil...@gmail.com>)
+==============================================================
+Development release.
commit fba24675ef05ea876bb5abd7c29bab10093ef282
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sun Jul 4 09:09:28 2010 +0800
Update NEWS for 0.9.0 release
diff --git a/NEWS b/NEWS
index e69de29..7bc795d 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,7 @@
+Release 0.9.0 (2010-07-03 Sam Spilsbury <smspil...@gmail.com>)
+==============================================================
+Development release.
+
+CMake Buildsystem.
+
+Adjust for libcompizconfig API changes.
\ No newline at end of file
commit db40d8410e1c40953109f4d41a22c447d3dc7dbf
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sun Jul 4 07:34:16 2010 +0800
Bump version
diff --git a/VERSION b/VERSION
index bc600a0..f626ec2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.5
+VERSION=0.9.0
commit f05968778dac914583fe23c21bba58bf061eef9e
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sun Jul 4 07:22:38 2010 +0800
Set project definition in cmake file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a598d4e..6a2ba33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,5 @@
+project (compizconfig-backend-gconf)
+
find_package (CompizConfig REQUIRED)
include (LibCompizConfigCommon)
commit 0007d69e63d7982d888d9e9d5d0d8c8e6d8cba8f
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Sun Jun 6 10:11:34 2010 +0800
Typo
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 863ebaf..a598d4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,5 +16,5 @@ compiz_print_configure_header ("CompizConfig GConf Storage
Backend")
compiz_print_configure_footer ()
compiz_add_uninstall ()
-compiz_add_package_generation ("CompizConfig GConf Storage Backend")
+compiz_package_generation ("CompizConfig GConf Storage Backend")
compiz_add_git_dist ()
commit f9d58342b1df25cc239a25a09b93b7de5eb18bc7
Author: Sam Spilsbury <smspil...@gmail.com>
Date: Fri May 14 12:20:05 2010 +0000
Add package generation
diff --git a/CMakeLists.txt b/CMakeLists.txt
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pte73-0001uf...@alioth.debian.org
