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

Proposed by Tim Chen on 2015-02-02
Status: Merged
Approved by: Sebastien Bacher on 2015-02-02
Approved revision: 12804
Merged at revision: 12804
Proposed branch: lp:~timchen119/unity-control-center/unity-control-center.lp1417034
Merge into: lp:unity-control-center
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
Reviewer Review Type Date Requested Status
Sebastien Bacher 2015-02-02 Approve on 2015-02-02
Review via email: mp+248220@code.launchpad.net

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 :

Thanks, that looks fine. In fact upstream even dropped the support for parsing Xorg.log (since the log might be missing with journald) [1]

[1] https://git.gnome.org/browse/gnome-control-center/commit/panels/info/cc-info-panel.c?id=c273c847e4368ae9e49e1750832e58bd412ea2da

Sebastien Bacher (seb128) :
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-02-02 10:03:24 +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