bump to 0.2.2.1

5 files changed, 27 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 4583b3b7..90a51c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+version 0.2.2.1
+	fixed playlist drawing regressions encountered in 0.2.2
+
 version 0.2.2	
 	fixed several build problems reported by users
 	added app icons, updated launcher script
diff --git a/PKGBUILD b/PKGBUILD
index b6eebb50..76c8b687 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
-pkgver=0.2.2
-pkgrel=2
+pkgver=0.2.2.1
+pkgrel=1
 pkgdesc="mp3/ogg/flac/ape/sid/mod/nsf music player based on GTK2"
 arch=(i686 x86_64)
 url="http://deadbeef.sourceforge.net"
@@ -12,7 +12,7 @@ depends=('gtk2' 'libsamplerate' 'alsa-lib')
 optdepends=('libvorbis: ogg vorbis playback', 'libmad: mp1/2/3 playback', 'flac: flac playback', 'curl: lastfm scrobbler')
 makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('62f745ed00ed835530b9ffc9b7e89df2')
+md5sums=('0a994bb60f4baba8f8f7439e42c336aa')
 
 build() {
     cd $srcdir/$pkgname-$pkgver
diff --git a/configure.in b/configure.in
index b312cfe2..15ec011a 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE="deadbeef"
-VERSION="0.2.2"
+VERSION="0.2.2.1"
 
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 
diff --git a/gtkplaylist.c b/gtkplaylist.c
index a3accbb1..a25c1bb3 100644
--- a/gtkplaylist.c
+++ b/gtkplaylist.c
@@ -176,8 +176,8 @@ gtkpl_setup_hscrollbar (gtkplaylist_t *ps) {
 void
 gtkpl_redraw_pl_row_novis (gtkplaylist_t *ps, int row, playItem_t *it) {
     draw_begin ((uintptr_t)ps->backbuf);
+    gtkpl_draw_pl_row_back (ps, row, it);
 	if (it) {
-        gtkpl_draw_pl_row_back (ps, row, it);
         gtkpl_draw_pl_row (ps, row, it);
     }
     draw_end ();
@@ -670,16 +670,18 @@ gtkpl_scroll (gtkplaylist_t *ps, int newscroll) {
                 gdk_draw_drawable (ps->backbuf, widget->style->black_gc, ps->backbuf, 0, d * rowheight, 0, 0, widget->allocation.width, widget->allocation.height-d * rowheight);
                 int i;
                 ps->scrollpos = newscroll;
-                for (i = ps->nvisiblerows-d; i <= ps->nvisiblerows; i++) {
-                    gtkpl_redraw_pl_row (ps, i+ps->scrollpos, gtkpl_get_for_idx (ps, i+ps->scrollpos));
+                int start = ps->nvisiblerows-d-1;
+                start = max (0, ps->nvisiblerows-d-1);
+                for (i = start; i <= ps->nvisiblerows; i++) {
+                    gtkpl_redraw_pl_row_novis (ps, i+ps->scrollpos, gtkpl_get_for_idx (ps, i+ps->scrollpos));
                 }
             }
             else {
                 gdk_draw_drawable (ps->backbuf, widget->style->black_gc, ps->backbuf, 0, 0, 0, d*rowheight, widget->allocation.width, widget->allocation.height);
                 ps->scrollpos = newscroll;
                 int i;
-                for (i = 0; i <= d; i++) {
-                    gtkpl_redraw_pl_row (ps, i+ps->scrollpos, gtkpl_get_for_idx (ps, i+ps->scrollpos));
+                for (i = 0; i <= d+1; i++) {
+                    gtkpl_redraw_pl_row_novis (ps, i+ps->scrollpos, gtkpl_get_for_idx (ps, i+ps->scrollpos));
                 }
             }
         }
diff --git a/web/index.html b/web/index.html
index 305aa536..96f16fbf 100644
--- a/web/index.html
+++ b/web/index.html
@@ -49,6 +49,17 @@
 
 <h1 id="news">News</h1>
 
+<h2>release 0.2.2.1 is out</h2>
+<div class="post">
+    <p class="date">2009/09/13</p>
+    <p>there was very unfortunate regression bug in 0.2.2, so here's quick fix</p>
+    <p><a href="#download">get it!</a></p>
+    <p>Changelog since 0.2.2.1</p>
+    <ul>
+        <li>fixed playlist drawing regressions encountered in 0.2.2</li>
+    </ul>
+</div>
+
 
 <h2>release 0.2.2 is out</h2>
 <div class="post">
@@ -266,10 +277,10 @@ implemented basic session management, window size/position, volume, playmode are
 </pre>
 
 <h1 id="download">Download</h1>
-<h2>Latest version 0.2.2:</h2>
+<h2>Latest version 0.2.2.1:</h2>
 <p>official Arch Linux PKGBUILD: <a href="http://aur.archlinux.org/packages.php?ID=29497">here</a></p>
 <p>if you have yaourt, you can simply do yaourt -S deadbeef</p>
-<p>source code for version 0.2.2 <a href="http://sourceforge.net/projects/deadbeef/files/deadbeef-0.2.2.tar.gz/download">deadbeef-0.2.2.tar.gz</a></p>
+<p>source code for version 0.2.2.1 <a href="http://sourceforge.net/projects/deadbeef/files/deadbeef-0.2.2.1.tar.gz/download">deadbeef-0.2.2.1.tar.gz</a></p>
 <p>or <a href="http://sourceforge.net/projects/deadbeef/files/">browse all files</a></p>
 <h2>version 0.2.1:</h2>
 <p>source code for version 0.2.1 <a href="http://sourceforge.net/projects/deadbeef/files/deadbeef-0.2.1.tar.gz/download">deadbeef-0.2.1.tar.gz</a></p>