Merge lp:~3v1n0/unity/opengl-version-check into lp:unity

[Marco Trevisan (Treviño)]

This allows to check for OpenGL version strings which are in the form X,Y due to some locale settings I guess.

I've just tried to run the current unity in a natty VirtualBox and it wasn't running due to the version mismatch, since the version string there is "2,0 Chromium 1,9". This small patch fixes the issue.

[Andrea Azzarone (azzar1)]

Looks good, approve.

review: Approve

[Tim Penhey (thumper)]

On Thu, 14 Jul 2011 05:13:21 you wrote:
> Treviño (Marco Trevisan) has proposed merging
> lp:~3v1n0/unity/opengl-version-check into lp:unity with
> lp:~3v1n0/unity/scroll-api-merge as a prerequisite.
>
> Requested reviews:
> Unity Team (unity-team)
>
> For more details, see:
> https://code.launchpad.net/~3v1n0/unity/opengl-version-check/+merge/67867
>
> This allows to check for OpenGL version strings which are in the form X,Y
> due to some locale settings I guess.
>
> I've just tried to run the current unity in a natty VirtualBox and it
> wasn't running due to the version mismatch, since the version string there
> is "2,0 Chromium 1,9". This small patch fixes the issue.

What are the chances you'd like to practice writing some tests?

I'd be keen to help you get this going. Unity has a test directory, and has
the google-test infrastructure for testing this.

[Marco Trevisan (Treviño) (3v1n0)]

Mh, was this a mail or a merge comment? :)

[Gord Allott (gordallott)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-07-10 14:16:30 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-07-13 17:54:29 +0000
@@ -1166,9 +1166,10 @@
   for (i = 0; isdigit (version_string[i]); i++)
     version = version * 10.0f + (version_string[i] - 48);
 
-  if (version_string[i++] == '.')
+  if ((version_string[i] == '.' || version_string[i] == ',') &&
+      isdigit (version_string[i+1]))
   {
-    version = version * 10.0f + (version_string[i] - 48);
+    version = version * 10.0f + (version_string[i+1] - 48);
     return (version + 0.1f) * 0.1f;
   }
   else