r17963 - in /desktop/experimental/yelp/debian: changelog patches/07_url_localfile.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Dec 23 20:10:46 UTC 2008


Author: joss
Date: Tue Dec 23 20:10:46 2008
New Revision: 17963

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17963
Log:
07_url_localfile.patch: new patch. Get GIO to read paths as well as 
URIs.

Modified:
    desktop/experimental/yelp/debian/changelog
    desktop/experimental/yelp/debian/patches/07_url_localfile.patch

Modified: desktop/experimental/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/changelog?rev=17963&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/changelog (original)
+++ desktop/experimental/yelp/debian/changelog Tue Dec 23 20:10:46 2008
@@ -13,8 +13,8 @@
   * Add glib 2.15.2 build-dependency for gio.
   * Regenerate 70_autotools.patch, and document how to do it.
   * Force the search implementation to be the basic one.
-  * 07_url_localfile.patch: new patch. Handle local URIs just like 
-    file: URIs, for broken doc-base OMF files with uri="/blah".
+  * 07_url_localfile.patch: new patch. Get GIO to read paths as well as 
+    URIs.
   * 06_text_plain.patch: do not kill handling of info and man pages 
     through file: URIs.
 

Modified: desktop/experimental/yelp/debian/patches/07_url_localfile.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/07_url_localfile.patch?rev=17963&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/patches/07_url_localfile.patch (original)
+++ desktop/experimental/yelp/debian/patches/07_url_localfile.patch Tue Dec 23 20:10:46 2008
@@ -1,29 +1,16 @@
-Index: yelp-2.24.0/src/yelp-utils.c
+Index: yelp-2.24.0/src/yelp-window.c
 ===================================================================
---- yelp-2.24.0.orig/src/yelp-utils.c	2008-12-23 20:06:34.384671865 +0100
-+++ yelp-2.24.0/src/yelp-utils.c	2008-12-23 20:13:19.936668697 +0100
-@@ -391,8 +391,8 @@ yelp_uri_resolve (gchar *uri, gchar **re
- 	    g_free (info_name);
- 	    g_free (info_sect);
- 	}
--    } else if (!strncmp (uri, "file:", 5)) {
--	int file_cut = 5;
-+    } else if (!strncmp (uri, "file:", 5) || *uri == '/') {
-+	int file_cut = (*uri == '/')?0:5;
- 	while (uri[file_cut+1] == '/')
- 	    file_cut++;
- 	ret = resolve_full_file (&intern_uri[file_cut]);
-@@ -439,13 +439,6 @@ yelp_uri_resolve (gchar *uri, gchar **re
- 	    *result = g_strdup (intern_uri);
- 	    *section = g_strdup (intern_section);
- 	}
--    } else if (*uri == '/' || g_str_has_suffix (uri, ".xml")) {
--	/* Quite probable it was supposed to be ours, but
--	 * the file doesn't exist.  Hence, we should bin it
--	 */
--	ret = YELP_RRN_TYPE_ERROR;
--	*result = NULL;
--	*section = NULL;
-     } else {
- 	/* We really don't care what it is.  It's not ours.  Let
- 	 * someone else handle it 
+--- yelp-2.24.0.orig/src/yelp-window.c	2008-12-23 21:11:14.449173149 +0100
++++ yelp-2.24.0/src/yelp-window.c	2008-12-23 21:11:22.124675902 +0100
+@@ -1633,7 +1633,10 @@ window_do_load_html (YelpWindow    *wind
+     
+     window_setup_window (window, type, uri, frag_id, uri, priv->base_uri, need_history);
+ 
+-    file = g_file_new_for_uri (uri);
++    if (*uri == '/')
++	file = g_file_new_for_path (uri);
++    else
++	file = g_file_new_for_uri (uri);
+     stream = g_file_read (file, NULL, NULL);
+ 
+     if (stream == NULL) {




More information about the pkg-gnome-commits mailing list