[Xfce4-commits] <ristretto:master> Fix segmentation-faults

[Stephan Arts]

Updating branch refs/heads/master
         to 3be74f9b0b2f911330724ce6563c64fa08a52222 (commit)
       from 407c2cfe5622b9248a5abfa6ed4e6f1d19829fb6 (commit)

commit 3be74f9b0b2f911330724ce6563c64fa08a52222
Author: Stephan Arts <stephan at xfce.org>
Date:   Wed Jul 27 22:20:14 2011 +0200

    Fix segmentation-faults

 src/image_viewer.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/image_viewer.c b/src/image_viewer.c
index a7c1d16..97888cb 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -789,7 +789,6 @@ rstto_image_viewer_transaction_free (RsttoImageViewerTransaction *tr)
     }
     g_object_unref (tr->cancellable);
     g_object_unref (tr->loader);
-    g_object_unref (tr->file);
     g_free (tr->buffer);
     g_free (tr);
 }
@@ -1005,15 +1004,8 @@ cb_rstto_image_loader_area_prepared (GdkPixbufLoader *loader, RsttoImageViewerTr
         timeout = gdk_pixbuf_animation_iter_get_delay_time (viewer->priv->iter);
     }
 
-    if (timeout != -1)
+    if (timeout > 0)
     {
-        /* fix borked stuff */
-        if (timeout == 0)
-        {
-            g_warning("timeout == 0: defaulting to 40ms");
-            timeout = 40;
-        }
-
         viewer->priv->animation_timeout_id = g_timeout_add(timeout, (GSourceFunc)cb_rstto_image_viewer_update_pixbuf, viewer);
     }   
     else
@@ -1083,7 +1075,7 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti
         rstto_image_viewer_transaction_free (transaction);
     }
 
-    rstto_image_viewer_queued_repaint (transaction->viewer, TRUE);
+    rstto_image_viewer_queued_repaint (viewer, TRUE);
 }
 
 static gboolean