r17964 - in /desktop/experimental/yelp/debian: changelog patches/08_html_livelock.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Dec 23 20:32:42 2008
New Revision: 17964

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17964
Log:
08_html_livelock.patch: new patch. Do not loop endlessly at the end 
of files.

Added:
    desktop/experimental/yelp/debian/patches/08_html_livelock.patch
Modified:
    desktop/experimental/yelp/debian/changelog
    desktop/experimental/yelp/debian/patches/series

Modified: desktop/experimental/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/changelog?rev=17964&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/changelog (original)
+++ desktop/experimental/yelp/debian/changelog Tue Dec 23 20:32:42 2008
@@ -17,6 +17,8 @@
     URIs.
   * 06_text_plain.patch: do not kill handling of info and man pages 
     through file: URIs.
+  * 08_html_livelock.patch: new patch. Do not loop endlessly at the end 
+    of files.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 23 Dec 2008 19:33:13 +0100
 

Added: desktop/experimental/yelp/debian/patches/08_html_livelock.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/08_html_livelock.patch?rev=17964&op=file
==============================================================================
--- desktop/experimental/yelp/debian/patches/08_html_livelock.patch (added)
+++ desktop/experimental/yelp/debian/patches/08_html_livelock.patch Tue Dec 23 20:32:42 2008
@@ -1,0 +1,13 @@
+Index: yelp-2.24.0/src/yelp-window.c
+===================================================================
+--- yelp-2.24.0.orig/src/yelp-window.c	2008-12-23 21:31:27.532671681 +0100
++++ yelp-2.24.0/src/yelp-window.c	2008-12-23 21:31:29.288665949 +0100
+@@ -1675,7 +1675,7 @@ window_do_load_html (YelpWindow    *wind
+     }
+ 
+     while ((g_input_stream_read_all
+-	    ((GInputStream *)stream, buffer, BUFFER_SIZE, &n, NULL, NULL))) {
++	    ((GInputStream *)stream, buffer, BUFFER_SIZE, &n, NULL, NULL)) && n) {
+ 	gchar *tmp;
+ 	tmp = g_utf8_strup (buffer, n);
+ 	if (strstr (tmp, "<FRAMESET")) {

Modified: desktop/experimental/yelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/series?rev=17964&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/patches/series (original)
+++ desktop/experimental/yelp/debian/patches/series Tue Dec 23 20:32:42 2008
@@ -3,4 +3,5 @@
 04_use_doc-base.patch
 06_text_plain.patch
 07_url_localfile.patch
+08_html_livelock.patch
 70_autotools.patch