--- pornview-0.2pre1.orig/src/support/image_loader.c
+++ pornview-0.2pre1/src/support/image_loader.c
@@ -81,7 +81,7 @@
 image_loader_stop (ImageLoader * il)
 {
 #ifdef USE_GTK2
-    GError *err;
+    GError *err = NULL;
 #endif
 
     if (!il)
@@ -174,7 +174,7 @@
     gint    c;
 
 #ifdef USE_GTK2
-    GError *err;
+    GError *err = NULL;
 #endif
 
     if (!il)
@@ -241,7 +241,7 @@
     int     b;
 
 #ifdef USE_GTK2
-    GError *err;
+    GError *err = NULL;
 #endif
 
     if (!il->loader || il->pixbuf)
--- pornview-0.2pre1.orig/src/support/widgets/gtkxine.c
+++ pornview-0.2pre1/src/support/widgets/gtkxine.c
@@ -632,7 +632,7 @@
      */
     if (this->vo_driver != NULL)
 	xine_close_video_driver (this->xine, this->vo_driver);
-    if (this->vo_driver != NULL)
+    if (this->ao_driver != NULL)
 	xine_close_audio_driver (this->xine, this->ao_driver);
 
     /*
@@ -1920,7 +1920,7 @@
  *  This function was pinched from filter_yuy2tov12.c, part of
  *  transcode, a linux video stream processing tool
  *
- *  Copyright (C) Thomas ŽÖstreich - June 2001
+ *  Copyright (C) Thomas ��streich - June 2001
  *
  *  Thanks Thomas
  *      
--- pornview-0.2pre1.orig/src/support/widgets/zlist.c
+++ pornview-0.2pre1/src/support/widgets/zlist.c
@@ -634,7 +634,8 @@
 					   CELL_X_FROM_COL (list, j), area->y,
 					   list->cell_x_pad, area->height);
 
-		cell = ZLIST_CELL_FROM_INDEX (list, idx);
+		if (idx < list->cell_count)
+		    cell = ZLIST_CELL_FROM_INDEX (list, idx);
 
 		cell_area.x = CELL_X_FROM_COL (list, j) + list->cell_x_pad;
 		cell_area.y = CELL_Y_FROM_ROW (list, i) + list->cell_y_pad;