Merge lp:~vanvugt/compiz/fix-1018730 into lp:compiz/0.9.8

[Daniel van Vugt]

Lift the 31/32 character restriction on key names that was causing so many
warnings. It's now 1024 characters according to glib. (LP: #1018730)

[Sam Spilsbury (smspillaz)]

+1

review: Approve

=== modified file 'compizconfig/gsettings/src/gsettings.c'
--- compizconfig/gsettings/src/gsettings.c	2012-05-21 15:37:47 +0000
+++ compizconfig/gsettings/src/gsettings.c	2012-06-28 09:08:41 +0000
@@ -79,10 +79,9 @@
 
     clean = g_strjoinv ("-", delimited);
 
-    /* It can't be more than 32 chars, warn if that's the case */
-    gchar *ret = g_strndup (clean, 31);
+    gchar *ret = g_strndup (clean, 1024);
 
-    if (strlen (clean) > 31)
+    if (strlen (clean) > 1024)
 	printf ("GSettings Backend: Warning: key name %s is not valid in GSettings, it was changed to %s, this may cause problems!\n", clean, ret);
 
     /* Everything must be lowercase */

=== modified file 'xslt/compiz_gsettings_schemas.xslt.in'
--- xslt/compiz_gsettings_schemas.xslt.in	2011-09-29 03:29:41 +0000
+++ xslt/compiz_gsettings_schemas.xslt.in	2012-06-28 09:08:41 +0000
@@ -419,10 +419,10 @@
 
   <!-- prints the key name -->
   <xsl:template name="printKeyName">
-    <!-- not allowed to have underscores, key names > 32 chars and upper case characters -->
+    <!-- not allowed to have underscores, key names > 1024 chars and upper case characters -->
     <xsl:param name="ASCIIUpper" >ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:param>
     <xsl:param name="ASCIILower" >abcdefghijklmnopqrstuvwxyz</xsl:param>
-    <xsl:value-of select="translate(substring(translate(@name, '_', '-'), 0, 32), $ASCIIUpper, $ASCIILower)"/>
+    <xsl:value-of select="translate(substring(translate(@name, '_', '-'), 0, 1024), $ASCIIUpper, $ASCIILower)"/>
   </xsl:template>
 
   <!-- converts a decimal number to a hex number -->