compizconfig-backend-gconf: Changes to 'upstream-unstable'
AUTHORS| 19 +
CMakeLists.txt | 12
ChangeLog | 738 +
NEWS | 17 -
VERSION|2
src/gconf.c|8
6 files changed, 764 insertions(+), 32 deletions(-)
New commits:
commit fa24b9a140e813b56c86c32d64de28af9f7c0163
Author: Janos Guljas ja...@resenje.org
Date: Tue Aug 2 21:25:12 2011 +0200
Imported Upstream version 0.9.5.0
diff --git a/AUTHORS b/AUTHORS
index 8b13789..dd427ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,18 @@
-
+Christopher Williams christoph...@verizon.net
+Danny Baumann dannybaum...@web.de
+Dennis Kasprzyk onest...@beryl-project.org
+Dennis Kasprzyk onest...@opencompositing.org
+Didier Roche didro...@ubuntu.com
+Erkin Bahceci erkin...@gmail.com
+Guido Iribarren guido...@guidoi.com.ar
+Guillaume Seguin guilla...@segu.in
+Jigish Gohil cyberorg@prime.(none)
+Kristian Lyngstøl kristian@albus.(none)
+Robert Carr racarr@gorbie.(none)
+Sam Spilsbury smspil...@gmail.com
+Sam Spilsbury sam.spilsb...@canonical.com
+Sam Spilsbury smspillaz@XPS-FEDORA.(none)
+Sam Spilsbury smspillaz@XPS-UNITY.(none)
+Sam Spilsbury smspil...@gmail.com
+Scott Moreau ore...@gmail.com
+maniac maniac
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab43d0..caee4b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,6 @@ include (LibCompizConfigCommon)
compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0)
-# compizconfig-gconf package version number
-# An odd micro number indicates in-progress development.
-# 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 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 ()
-
-compiz_add_uninstall ()
compiz_package_generation (CompizConfig GConf Storage Backend)
-compiz_add_git_dist ()
diff --git a/ChangeLog b/ChangeLog
index e69de29..fde4aa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,738 @@
+Sam Spilsbury sam.spilsb...@canonical.com2011-07-13
+
+Added some extended debugging info when failing to read keys
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-07-07
+
+Add new release commands
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-07-07
+
+Bump VERSION
+
+Scott Moreau ore...@gmail.com2011-05-13
+
+* Bump version to 0.9.5
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-03-07
+
+Bump VERSION to 0.9.4
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-03-07
+
+Update CMake Version
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-03-07
+
+Update news for 0.9.4 release
+
+Sam Spilsbury smspillaz@XPS-UNITY.(none) 2010-12-13
+
+Fix branch confusion
+
+Merge: 9e2664b 55a267f
+Sam Spilsbury sam.spilsb...@canonical.com2010-12-10
+
+Merge branch 'master' of
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-backend-gconf
+
+Sam Spilsbury sam.spilsb...@canonical.com2010-12-10
+
+Add multiscreen support
+
+Sam Spilsbury sam.spilsb...@canonical.com2010-12-10
+
+Fix setting /allscreens, we should set /screen%i (defaults to screen 0)
+
+Didier Roche didro...@ubuntu.com 2010-11-26
+
+fix schema owner and typo
+
+Sam Spilsbury sam.spilsb...@canonical.com2010-11-23
+
+Change paths so that old and new settings don't conflict
+
+Sam Spilsbury smspil...@gmail.com2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury smspil...@gmail.com2010-11-06
+
+Update NEWS for 0.9.2.1 Release
+
+Sam Spilsbury smspil...@gmail.com2010-11-06
+
+Set COMPIZCONFIG_GCONF_VERSION_MACRO and update to 0.9.2.1
+
+Sam Spilsbury smspil...@gmail.com2010-11-06
+
+Update to 0.9.2.1
+
+Sam Spilsbury smspil...@gmail.com2010-10-24
+
+Fix date on NEWS
+
+Sam Spilsbury smspil...@gmail.com2010-10-24
+
+Update NEWS for 0.9.2 release
+
+Sam Spilsbury smspil...@gmail.com2010-07-04
+
+Update NEWS for 0.9.0 release
+
+Sam Spilsbury smspil...@gmail.com2010-07-04
+
+Bump version
+
+Sam Spilsbury smspil...@gmail.com2010-07-04
+
+Set project definition in cmake file
+
+Sam Spilsbury smspil...@gmail.com2010-06-06
+
+Typo
+
+Sam Spilsbury smspil...@gmail.com2010-05-14
+
+Add package generation
+
+Sam Spilsbury smspil...@gmail.com2010-05-14
+
+Update for libcompizconfig buildsystem changes
+and add dist and uninstall targets
+
+Merge: 350e4d5 2adeb06
+Sam Spilsbury smspillaz@XPS-FEDORA.(none)2010-05-07
+
+Merge branch 'compiz++' of
git+ssh://smspil...@git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf
into compiz++
+
+Merge: 74c3fd4 091f2d0
+Danny Baumann dannybaum...@web.de2010-05-03
+
+
compizconfig-backend-gconf: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
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
compizconfig-backend-gconf: Changes to 'upstream-unstable'
VERSION |2 +-
settings-backend/gconf.c | 29 -
2 files changed, 17 insertions(+), 14 deletions(-)
New commits:
commit 92d910aa088dd6f42f39eec5c804b141a2d5e5e9
Author: Guillaume Seguin guilla...@segu.in
Date: Wed Oct 14 04:09:09 2009 +0200
* Bump version to 0.8.4
diff --git a/VERSION b/VERSION
index 9b265c0..e4184f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.3
+VERSION=0.8.4
commit 5d392b4c1f4e216656369ab2bd5ef783f60e9d86
Author: Erkin Bahceci erkin...@gmail.com
Date: Fri Sep 25 11:07:54 2009 -0500
Sync metacity with staticswitcher instead of switcher.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 7cca9b3..e94d825 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -172,9 +172,9 @@ const SpecialOption specialOptions[] = {
{fullscreen_visual_bell, fade, TRUE,
METACITY /general/visual_bell_type, OptionSpecial},
-{next_key, switcher, FALSE,
+{next_key, staticswitcher, FALSE,
METACITY /global_keybindings/switch_windows, OptionKey},
-{prev_key, switcher, FALSE,
+{prev_key, staticswitcher, FALSE,
METACITY /global_keybindings/switch_windows_backward, OptionKey},
{toggle_sticky_key, extrawm, FALSE,
commit c08a69a7e917209d88bc45e2c82c1a4a40d1969a
Author: Erkin Bahceci erkin...@gmail.com
Date: Thu Sep 24 19:04:00 2009 -0500
Fix crash (LP: #407020).
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 6a1d30a..7cca9b3 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -1834,17 +1834,20 @@ checkProfile (CCSContext *context)
else
currentProfile = strdup (profile);
-if (strcmp (lastProfile, currentProfile) != 0)
+if (!lastProfile || strcmp (lastProfile, currentProfile) != 0)
{
char *pathName;
- /* copy /apps/compiz tree to profile path */
- asprintf (pathName, %s/%s, PROFILEPATH, lastProfile);
- if (pathName)
+ if (lastProfile)
{
- copyGconfTree (context, COMPIZ, pathName,
- TRUE, /schemas COMPIZ);
- free (pathName);
+ /* copy /apps/compiz tree to profile path */
+ asprintf (pathName, %s/%s, PROFILEPATH, lastProfile);
+ if (pathName)
+ {
+ copyGconfTree (context, COMPIZ, pathName,
+ TRUE, /schemas COMPIZ);
+ free (pathName);
+ }
}
/* reset /apps/compiz tree */
commit 7d8ba7d820e43af40e2b8407fbb5606ff10c501f
Author: Danny Baumann dannybaum...@web.de
Date: Wed Apr 8 20:31:08 2009 +0200
Fix warning.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index cce63b1..6a1d30a 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -406,7 +406,7 @@ isIntegratedOption (CCSSetting *setting,
for (i = 0; i N_SOPTIONS; i++)
{
- SpecialOption *opt = specialOptions[i];
+ const SpecialOption *opt = specialOptions[i];
if (strcmp (setting-name, opt-settingName) != 0)
continue;
commit f67aaea7e1161b221423d6015c38e6d7dd0af32d
Author: Danny Baumann dannybaum...@web.de
Date: Wed Apr 8 20:30:16 2009 +0200
Fix setting integration for screenshot and terminal commands.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 8d104b3..cce63b1 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -351,11 +351,11 @@ const SpecialOption specialOptions[] = {
{rotate_right_window_key, rotate, FALSE,
METACITY /window_keybindings/move_to_workspace_right, OptionKey},
-{command_screenshot, core, FALSE,
+{command_screenshot, gnomecompat, FALSE,
METACITY /keybinding_commands/command_screenshot, OptionString},
-{command_window_screenshot, core, FALSE,
+{command_window_screenshot, gnomecompat, FALSE,
METACITY /keybinding_commands/command_window_screenshot, OptionString},
-{command_terminal, core, FALSE,
+{command_terminal, gnomecompat, FALSE,
/desktop/gnome/applications/terminal/exec, OptionString},
{current_viewport, thumbnail, TRUE,
commit 62a307f19702e08a99d6d95ba0b683d6b0b06dc7
Author: Guillaume Seguin guilla...@segu.in
Date: Mon Mar 9 15:43:49 2009 +0100
* Bump version to 0.8.3
diff --git a/VERSION b/VERSION
index 2dcc312..9b265c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.2
+VERSION=0.8.3
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
compizconfig-backend-gconf: Changes to 'upstream-unstable'
VERSION |2
settings-backend/gconf.c | 136 ++-
2 files changed, 78 insertions(+), 60 deletions(-)
New commits:
commit b5699e6559d09a1b27314db42682c03faee206f5
Author: Guillaume Seguin guilla...@segu.in
Date: Mon Mar 9 15:43:49 2009 +0100
* Bump version to 0.8.2
diff --git a/VERSION b/VERSION
index 1357b31..2dcc312 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.9
+VERSION=0.8.2
commit ad3a92b4ae2aa1fd8717cb8798addda661661d06
Author: Danny Baumann dannybaum...@web.de
Date: Thu Feb 5 08:27:42 2009 +0100
Track option movements.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 9b72c91..8d104b3 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -115,15 +115,15 @@ typedef struct _SpecialOption {
} SpecialOption;
const SpecialOption specialOptions[] = {
-{run_key, core, FALSE,
+{run_key, gnomecompat, FALSE,
METACITY /global_keybindings/panel_run_dialog, OptionKey},
-{main_menu_key, core, FALSE,
+{main_menu_key, gnomecompat, FALSE,
METACITY /global_keybindings/panel_main_menu, OptionKey},
-{run_command_screenshot_key, core, FALSE,
+{run_command_screenshot_key, gnomecompat, FALSE,
METACITY /global_keybindings/run_command_screenshot, OptionKey},
-{run_command_window_screenshot_key, core, FALSE,
+{run_command_window_screenshot_key, gnomecompat, FALSE,
METACITY /global_keybindings/run_command_window_screenshot, OptionKey},
-{run_command_terminal_key, core, FALSE,
+{run_command_terminal_key, gnomecompat, FALSE,
METACITY /global_keybindings/run_command_terminal, OptionKey},
{toggle_window_maximized_key, core, FALSE,
@@ -182,54 +182,54 @@ const SpecialOption specialOptions[] = {
{toggle_fullscreen_key, extrawm, FALSE,
METACITY /window_keybindings/toggle_fullscreen, OptionKey},
-{command0, core, FALSE,
+{command0, commands, FALSE,
METACITY /keybinding_commands/command_1, OptionString},
-{command1, core, FALSE,
+{command1, commands, FALSE,
METACITY /keybinding_commands/command_2, OptionString},
-{command2, core, FALSE,
+{command2, commands, FALSE,
METACITY /keybinding_commands/command_3, OptionString},
-{command3, core, FALSE,
+{command3, commands, FALSE,
METACITY /keybinding_commands/command_4, OptionString},
-{command4, core, FALSE,
+{command4, commands, FALSE,
METACITY /keybinding_commands/command_5, OptionString},
-{command5, core, FALSE,
+{command5, commands, FALSE,
METACITY /keybinding_commands/command_6, OptionString},
-{command6, core, FALSE,
+{command6, commands, FALSE,
METACITY /keybinding_commands/command_7, OptionString},
-{command7, core, FALSE,
+{command7, commands, FALSE,
METACITY /keybinding_commands/command_8, OptionString},
-{command8, core, FALSE,
+{command8, commands, FALSE,
METACITY /keybinding_commands/command_9, OptionString},
-{command9, core, FALSE,
+{command9, commands, FALSE,
METACITY /keybinding_commands/command_10, OptionString},
-{command10, core, FALSE,
+{command10, commands, FALSE,
METACITY /keybinding_commands/command_11, OptionString},
-{command11, core, FALSE,
+{command11, commands, FALSE,
METACITY /keybinding_commands/command_12, OptionString},
-{run_command0_key, core, FALSE,
+{run_command0_key, commands, FALSE,
METACITY /global_keybindings/run_command_1, OptionKey},
-{run_command1_key, core, FALSE,
+{run_command1_key, commands, FALSE,
METACITY /global_keybindings/run_command_2, OptionKey},
-{run_command2_key, core, FALSE,
+{run_command2_key, commands, FALSE,
METACITY /global_keybindings/run_command_3, OptionKey},
-{run_command3_key, core, FALSE,
+{run_command3_key, commands, FALSE,
METACITY /global_keybindings/run_command_4, OptionKey},
-{run_command4_key, core, FALSE,
+{run_command4_key, commands, FALSE,
METACITY /global_keybindings/run_command_5, OptionKey},
-{run_command5_key, core, FALSE,
+{run_command5_key, commands, FALSE,
METACITY /global_keybindings/run_command_6, OptionKey},
-{run_command6_key, core, FALSE,
+{run_command6_key, commands, FALSE,
METACITY /global_keybindings/run_command_7, OptionKey},
-{run_command7_key, core, FALSE,
+{run_command7_key, commands, FALSE,
METACITY /global_keybindings/run_command_8, OptionKey},
-{run_command8_key, core, FALSE,
+{run_command8_key, commands, FALSE,
METACITY /global_keybindings/run_command_9, OptionKey},
-{run_command9_key, core, FALSE,
+{run_command9_key, commands, FALSE,
METACITY /global_keybindings/run_command_10, OptionKey},
-{run_command10_key, core, FALSE,
+{run_command10_key, commands, FALSE,
METACITY /global_keybindings/run_command_11, OptionKey},
-{run_command11_key, core,
compizconfig-backend-gconf: Changes to 'upstream-unstable'
VERSION |2 -
settings-backend/gconf.c | 58 +--
2 files changed, 18 insertions(+), 42 deletions(-)
New commits:
commit 3f1c3f5d7502fd8e91b183568dcc63d0e736f32b
Author: Guillaume Seguin [EMAIL PROTECTED]
Date: Sat May 31 14:08:55 2008 +0200
* Bump version to 0.7.6
diff --git a/VERSION b/VERSION
index 130f2d5..6410fd5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.5
+VERSION=0.7.6
commit fc1a518877207bfbc7abcfb97202d0199acdc8ef
Author: Danny Baumann [EMAIL PROTECTED]
Date: Wed Apr 23 11:30:49 2008 +0200
Fixed applying schemas to copied profiles.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index e837147..428057a 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -701,16 +701,19 @@ copyGconfValues (GConfEngine *conf,
if (associate schemaPath)
asprintf (newSchema, %s/%s, schemaPath, name + 1);
- value = gconf_engine_get_without_default (conf, key, NULL);
- if (value newKey)
- {
- if (newSchema)
- gconf_engine_associate_schema (conf, newKey,
- newSchema, NULL);
- gconf_engine_set (conf, newKey, value, NULL);
+ if (newKey newSchema)
+ gconf_engine_associate_schema (conf, newKey, newSchema, NULL);
- gconf_value_free (value);
+ 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)
@@ -766,12 +769,10 @@ copyGconfRecursively (GConfEngine *conf,
if (newSchema)
free (newSchema);
- if (to)
- {
- if (newKey)
- free (newKey);
- }
- else
+ if (newKey)
+ free (newKey);
+
+ if (!to)
gconf_engine_remove_dir (conf, path, NULL);
}
@@ -1848,8 +1849,8 @@ checkProfile (CCSContext *context)
asprintf (pathName, %s/%s, PROFILEPATH, lastProfile);
if (pathName)
{
- copyGconfTree (context, /apps/compiz, pathName,
- TRUE, /schemas/apps/compiz);
+ copyGconfTree (context, COMPIZ, pathName,
+ TRUE, /schemas COMPIZ);
free (pathName);
}
commit ba560d5f21d9564439e59d3653ccf59d3b092e77
Author: Danny Baumann [EMAIL PROTECTED]
Date: Fri Apr 18 21:12:55 2008 +0200
Remove integration for plane plugin settings.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index e837147..9443609 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -262,31 +262,6 @@ const SpecialOption specialOptions[] = {
{rotate_right_key, rotate, FALSE,
METACITY /global_keybindings/switch_to_workspace_right, OptionKey},
-{plane_to_1_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_1, OptionKey},
-{plane_to_2_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_2, OptionKey},
-{plane_to_3_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_3, OptionKey},
-{plane_to_4_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_4, OptionKey},
-{plane_to_5_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_5, OptionKey},
-{plane_to_6_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_6, OptionKey},
-{plane_to_7_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_7, OptionKey},
-{plane_to_8_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_8, OptionKey},
-{plane_to_9_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_9, OptionKey},
-{plane_to_10_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_10, OptionKey},
-{plane_to_11_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_11, OptionKey},
-{plane_to_12_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_12, OptionKey},
-
{switch_to_1_key, vpswitch, FALSE,
METACITY /global_keybindings/switch_to_workspace_1, OptionKey},
{switch_to_2_key, vpswitch, FALSE,
commit b7f4cd69f830571f7affc151daa03f856819d0f5
Author: Guillaume Seguin [EMAIL PROTECTED]
Date: Fri Apr 4 00:17:26 2008 +0200
* Bump version to 0.7.5
diff --git a/VERSION b/VERSION
index 8eafcce..130f2d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.4
+VERSION=0.7.5
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe.
compizconfig-backend-gconf: Changes to 'upstream-unstable'
VERSION |2
configure.ac |2
settings-backend/gconf.c | 903 +++
3 files changed, 369 insertions(+), 538 deletions(-)
New commits:
commit eab7857a661fe71331266688ecd6523d9210bfe3
Author: Guillaume Seguin [EMAIL PROTECTED]
Date: Fri Apr 4 00:17:25 2008 +0200
* Bump version to 0.7.4
diff --git a/VERSION b/VERSION
index a48124b..8eafcce 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.3
+VERSION=0.7.4
commit 9eb664c9e44695105dab379d514b20c71f9db637
Author: Guillaume Seguin [EMAIL PROTECTED]
Date: Thu Mar 6 22:46:37 2008 +0100
* Bump version to 0.7.3
diff --git a/VERSION b/VERSION
index 70d11ae..a48124b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.2
+VERSION=0.7.3
commit 30a7e4000fc7640ffc99c6e2778163488b1a2d1f
Author: Guillaume Seguin [EMAIL PROTECTED]
Date: Thu Mar 6 22:46:36 2008 +0100
* Bump version to 0.7.2
diff --git a/VERSION b/VERSION
index 58d3865..70d11ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.6.99
+VERSION=0.7.2
commit 567e48816362ef9c50029791dec024d31b85ca09
Author: Danny Baumann [EMAIL PROTECTED]
Date: Sun Feb 10 12:51:03 2008 +0100
Fix move, resize window menu initiate binding integration.
diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 311d113..e837147 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -150,13 +150,20 @@ const SpecialOption specialOptions[] = {
{show_desktop_key, core, FALSE,
METACITY /global_keybindings/show_desktop, OptionKey},
+{initiate_key, move, FALSE,
+ METACITY /window_keybindings/begin_move, OptionKey},
+{initiate_key, resize, FALSE,
+ METACITY /window_keybindings/begin_resize, OptionKey},
+{window_menu_key, core, FALSE,
+ METACITY /window_keybindings/activate_window_menu, OptionKey},
+
+/* integration of Metacity's mouse_button_modifier option */
{initiate_button, move, FALSE,
METACITY /window_keybindings/begin_move, OptionSpecial},
{initiate_button, resize, FALSE,
METACITY /window_keybindings/begin_resize, OptionSpecial},
{window_menu_button, core, FALSE,
METACITY /window_keybindings/activate_window_menu, OptionSpecial},
-/* this option does not exist in Compiz */
{mouse_button_modifier, NULL, FALSE,
METACITY /general/mouse_button_modifier, OptionSpecial},
@@ -1087,33 +1094,20 @@ readIntegratedOption (CCSContext *context,
((strcmp (settingName, window_menu_button) == 0)
(strcmp (pluginName, core) == 0)))
{
- if (gconfValue-type == GCONF_VALUE_STRING)
- {
- const char *value;
-
- value = gconf_value_get_string (gconfValue);
+ CCSSettingButtonValue button;
+ memset (button, 0, sizeof (CCSSettingButtonValue));
+ ccsGetButton (setting, button);
+
+ button.buttonModMask = getGnomeMouseButtonModifier ();
+ if (strcmp (settingName, window_menu_button) == 0)
+ button.button = 3;
+ else if (strcmp (pluginName, resize) == 0)
+ button.button = 2;
+ else
+ button.button = 1;
- if (value)
- {
- CCSSettingButtonValue button;
- memset (button, 0, sizeof (CCSSettingButtonValue));
- ccsGetButton (setting, button);
- if (ccsStringToButtonBinding (value, button))
- {
- button.buttonModMask =
- getGnomeMouseButtonModifier ();
- if (strcmp (settingName, window_menu_button) == 0)
- button.button = 3;
- else if (strcmp (pluginName, resize) == 0)
- button.button = 2;
- else
- button.button = 1;
-
- ccsSetButton (setting, button);
- ret = TRUE;
- }
- }
- }
+ ccsSetButton (setting, button);
+ ret = TRUE;
}
}
break;
@@ -1625,28 +1619,9 @@ writeIntegratedOption (CCSContext *context,
((strcmp (settingName, window_menu_button) == 0)
(strcmp (pluginName, core) == 0)))
{
- char *newValue;
- gchar*currentValue;
unsigned int modMask;
modMask = setting-value-value.asButton.buttonModMask;
- newValue =
- ccsButtonBindingToString (setting-value-value.asButton);
- if (newValue)
- {
- currentValue =
compizconfig-backend-gconf: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
