Merge lp:~charlesk/indicator-sound/lp-944250 into lp:indicator-sound/fifth

Proposed by Charles Kerr on 2012-03-03
Status: Merged
Approved by: Ted Gould on 2012-03-05
Approved revision: 303
Merge reported by: Charles Kerr
Merged at revision: not available
Proposed branch: lp:~charlesk/indicator-sound/lp-944250
Merge into: lp:indicator-sound/fifth
Diff against target: 12 lines (+1/-1)
1 file modified
src/metadata-widget.c (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-sound/lp-944250
Reviewer Review Type Date Requested Status
Ted Gould (community) 2012-03-03 Approve on 2012-03-05
Review via email: mp+95744@code.launchpad.net

Description of the change

The old value '5' isn't valid. Resolved by using the symbolic enum names instead.

A real fix, after we're finished maintaining compatibility with Gtk 2, would be to revise the code to not use GtkStyle...

To post a comment you must log in.
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/metadata-widget.c'
--- src/metadata-widget.c 2012-02-24 16:56:22 +0000
+++ src/metadata-widget.c 2012-03-03 19:20:23 +0000
@@ -528,7 +528,7 @@
528 bg_normal.g = style->bg[0].green/65535.0;528 bg_normal.g = style->bg[0].green/65535.0;
529 bg_normal.b = style->bg[0].blue/65535.0;529 bg_normal.b = style->bg[0].blue/65535.0;
530530
531 gint state = selected ? 5 : 0;531 const gint state = selected ? GTK_STATE_SELECTED : GTK_STATE_NORMAL;
532 532
533 fg_normal.r = style->fg[state].red/65535.0;533 fg_normal.r = style->fg[state].red/65535.0;
534 fg_normal.g = style->fg[state].green/65535.0;534 fg_normal.g = style->fg[state].green/65535.0;

Subscribers

People subscribed via source and target branches