Merge lp:~timchen119/unity-control-center/unity-control-center.lp1417034.trusty into lp:unity-control-center/14.04

[Tim Chen]

Set higher priority of glxinfo's result then Xorg's log for
"Details" -> "Overview" -> "Graphics" info in control center.
(LP: #1417034)

  * Set higher priority of glxinfo's result then Xorg's log for
    "Details" -> "Overview" -> "Graphics" info in control center.
    (LP: #1417034)

[Sebastien Bacher (seb128)]

Thanks Tim, could you proposed the change against
lp:unity-control-center/14.04 so we can use CI for the landing?

review: Needs Fixing

[Tim Chen (timchen119)]

Done, now targeted lp:unity-control-center/14.04 and proposal resubmitted. Thanks.

review: Needs Resubmitting

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'panels/info/cc-info-panel.c'
--- panels/info/cc-info-panel.c	2014-03-14 14:43:48 +0000
+++ panels/info/cc-info-panel.c	2015-04-08 06:51:21 +0000
@@ -450,10 +450,10 @@
   result->glx_renderer = get_graphics_data_glx_renderer ();
   result->xorg_vesa_hardware = get_graphics_data_xorg_vesa_hardware ();
 
-  if (result->xorg_vesa_hardware != NULL)
+  if (result->glx_renderer != NULL)
+    result->hardware_string = result->glx_renderer;
+  else if (result->xorg_vesa_hardware != NULL)
     result->hardware_string = result->xorg_vesa_hardware;
-  else if (result->glx_renderer != NULL)
-    result->hardware_string = result->glx_renderer;
   else
     result->hardware_string = _("Unknown");