Merge lp:~timo-jyrinki/compiz-core/blacklist_remove_double_escape_from_xml2-0.9.7 into lp:compiz-core

[Timo Jyrinki]

Remove problematic double escaping ('\\.') from the unredirect_driver_blacklist default. (LP: #1091103)

Remove problematic double escaping ('\\.') from the unredirect_driver_blacklist default. (LP: #1091103)

Same as https://code.launchpad.net/~timo-jyrinki/compiz/blacklist_remove_double_escape_from_xml2/+merge/140194 for lp:compiz

[Łukasz Zemczak (sil2100)]

The same as for lp:compiz. +1

review: Approve

=== modified file 'plugins/opengl/opengl.xml.in'
--- plugins/opengl/opengl.xml.in	2012-12-13 07:42:28 +0000
+++ plugins/opengl/opengl.xml.in	2012-12-19 08:23:21 +0000
@@ -46,7 +46,7 @@
 	    <option name="unredirect_driver_blacklist" type="string">
 		<_short>Unredirect Driver Blacklist</_short>
 		<_long>If non-empty, specifies a POSIX (extended) regular expression to match against the OpenGL driver strings (newline separated): "GL_VENDOR\nGL_RENDERER\nGL_VERSION". If the regular expression matches a substring of that concatenation then no windows will ever be unredirected while using that particular graphics driver.</_long>
-		<default>(nouveau|Intel).*Mesa 8\\.0</default>
+		<default>(nouveau|Intel).*Mesa 8.0</default>
 	    </option>
 	</options>
     </plugin>

=== modified file 'plugins/opengl/src/blacklist/tests/test-blacklist.cpp'
--- plugins/opengl/src/blacklist/tests/test-blacklist.cpp	2012-12-13 07:42:28 +0000
+++ plugins/opengl/src/blacklist/tests/test-blacklist.cpp	2012-12-19 08:23:21 +0000
@@ -28,7 +28,7 @@
 
 using namespace compiz::opengl;
 
-static const char *recommendedRegex = "(nouveau|Intel).*Mesa 8\\.0";
+static const char *recommendedRegex = "(nouveau|Intel).*Mesa 8.0";
 
 TEST(DriverBlacklist, QuantalIntelIsGood)
 {