Merge lp://qastaging/~bratsche/xsplash/last-frame-for-0.7 into lp://qastaging/~bratsche/xsplash/release-0.7

Proposed by Cody Russell
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~bratsche/xsplash/last-frame-for-0.7
Merge into: lp://qastaging/~bratsche/xsplash/release-0.7
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~bratsche/xsplash/last-frame-for-0.7
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+11531@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Russell (bratsche) wrote :

This is a patch from Anders Kaseorg that has already been merged into master. Need to merge it into 0.7 branch for the next release.

Revision history for this message
Mirco Müller (macslow) wrote :

> This is a patch from Anders Kaseorg that has already been merged into master.
> Need to merge it into 0.7 branch for the next release.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/xsplash.c'
2--- src/xsplash.c 2009-08-31 20:21:47 +0000
3+++ src/xsplash.c 2009-09-10 14:32:04 +0000
4@@ -426,7 +426,7 @@
5
6 server = (XsplashServer *)user_data;
7 priv = XSPLASH_SERVER_GET_PRIVATE (server);
8- frame = MAX (throbber_frames * progress - 1, 0);
9+ frame = MIN (throbber_frames * progress, throbber_frames - 1);
10
11 height = gdk_pixbuf_get_height (priv->throbber_pixbuf) / throbber_frames;
12 y_offset = height * (frame);

Subscribers

People subscribed via source and target branches

to all changes: