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". Trouble? Contact [EMAIL PROTECTED]
