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

Proposed by Tim Chen on 2015-04-08
Status: Merged
Approved by: Sebastien Bacher on 2015-04-08
Approved revision: 12781
Merged at revision: 12781
Proposed branch: lp:~timchen119/unity-control-center/unity-control-center.lp1417034.trusty
Merge into: lp:unity-control-center/14.04
Diff against target: 16 lines (+3/-3)
1 file modified
panels/info/cc-info-panel.c (+3/-3)
To merge this branch: bzr merge lp:~timchen119/unity-control-center/unity-control-center.lp1417034.trusty
Reviewer Review Type Date Requested Status
Sebastien Bacher 2015-04-08 Approve on 2015-04-08
Tim Chen (community) Resubmit on 2015-04-08
Review via email: mp+255462@code.launchpad.net

This proposal supersedes a proposal from 2015-04-07.

Commit message

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

Description of the change

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

To post a comment you must log in.
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

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) wrote :

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

review: Resubmit
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/info/cc-info-panel.c'
2--- panels/info/cc-info-panel.c 2014-03-14 14:43:48 +0000
3+++ panels/info/cc-info-panel.c 2015-04-08 06:51:21 +0000
4@@ -450,10 +450,10 @@
5 result->glx_renderer = get_graphics_data_glx_renderer ();
6 result->xorg_vesa_hardware = get_graphics_data_xorg_vesa_hardware ();
7
8- if (result->xorg_vesa_hardware != NULL)
9+ if (result->glx_renderer != NULL)
10+ result->hardware_string = result->glx_renderer;
11+ else if (result->xorg_vesa_hardware != NULL)
12 result->hardware_string = result->xorg_vesa_hardware;
13- else if (result->glx_renderer != NULL)
14- result->hardware_string = result->glx_renderer;
15 else
16 result->hardware_string = _("Unknown");
17

Subscribers

People subscribed via source and target branches