Author: titmuss
Date: Fri Apr 11 04:40:46 2008
New Revision: 2217
URL: http://svn.slimdevices.com?rev=2217&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2213): titmuss | 2008-04-11 12:32:15 +0100
[EMAIL PROTECTED] (orig r2212): titmuss | 2008-04-11 12:29:54 +0100
Bug: 5407
Description:
Text input does not yet support non ascii characters, so remove them for the
7.0.1 release.
[EMAIL PROTECTED] (orig r2214): titmuss | 2008-04-11 12:33:43 +0100
Bug: 5407
Description:
Revert change made for 7.0.1.
[EMAIL PROTECTED] (orig r2216): titmuss | 2008-04-11 12:40:29 +0100
[EMAIL PROTECTED] (orig r2215): titmuss | 2008-04-11 12:39:53 +0100
Bug: 7655
Description:
Fix crash (division by zero).
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_icon.c
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Apr 11 04:40:46 2008
@@ -1,4 +1,5 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2208
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2215
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2216
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_icon.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_icon.c?rev=2217&root=Jive&r1=2216&r2=2217&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_icon.c (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_icon.c Fri Apr 11
04:40:46 2008
@@ -269,7 +269,9 @@
if (peer->img) {
jive_surface_get_size(peer->img, &w, &h);
- w /= peer->anim_total;
+ if (peer->anim_total) {
+ w /= peer->anim_total;
+ }
w += peer->w.padding.left + peer->w.padding.right;
h += peer->w.padding.top + peer->w.padding.bottom;
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
