Merge lp:~brandontschaefer/overlay-scrollbar/lp.1109115-CID-13650 into lp:overlay-scrollbar

Proposed by Brandon Schaefer
Status: Merged
Approved by: Allan LeSage
Approved revision: 365
Merged at revision: 365
Proposed branch: lp:~brandontschaefer/overlay-scrollbar/lp.1109115-CID-13650
Merge into: lp:overlay-scrollbar
Diff against target: 23 lines (+0/-2)
2 files modified
os/os-scrollbar.c (+0/-1)
os/os-thumb.c (+0/-1)
To merge this branch: bzr merge lp:~brandontschaefer/overlay-scrollbar/lp.1109115-CID-13650
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Allan LeSage (community) Approve
Review via email: mp+146249@code.launchpad.net

Commit message

Fixes CID-13650, default case should never be able to be reached.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Brandon and I discussed, I'm going to approve and push!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Configuration error in the Jenkins job, should be corrected, approving again. . . .

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c 2012-11-30 07:51:59 +0000
+++ os/os-scrollbar.c 2013-02-02 00:49:21 +0000
@@ -2138,7 +2138,6 @@
21382138
2139 switch (priv->side)2139 switch (priv->side)
2140 {2140 {
2141 default:
2142 case OS_SIDE_RIGHT:2141 case OS_SIDE_RIGHT:
2143 window_edge = GDK_WINDOW_EDGE_EAST;2142 window_edge = GDK_WINDOW_EDGE_EAST;
2144 break;2143 break;
21452144
=== modified file 'os/os-thumb.c'
--- os/os-thumb.c 2012-11-26 14:35:24 +0000
+++ os/os-thumb.c 2013-02-02 00:49:21 +0000
@@ -782,7 +782,6 @@
782 pattern_add_gdk_rgba_stop (pat, 0.5, &bg_shadow, 0.06);782 pattern_add_gdk_rgba_stop (pat, 0.5, &bg_shadow, 0.06);
783 switch (action)783 switch (action)
784 {784 {
785 default:
786 case ACTION_NORMAL:785 case ACTION_NORMAL:
787 pattern_add_gdk_rgba_stop (pat, 0.0, &bg_shadow, 0.22);786 pattern_add_gdk_rgba_stop (pat, 0.0, &bg_shadow, 0.22);
788 pattern_add_gdk_rgba_stop (pat, 1.0, &bg_shadow, 0.22);787 pattern_add_gdk_rgba_stop (pat, 1.0, &bg_shadow, 0.22);

Subscribers

People subscribed via source and target branches