goffice r2211 - in trunk: . goffice/utils

[mortenw svn gnome org]

Author: mortenw
Date: Thu Sep  4 20:36:00 2008
New Revision: 2211
URL: http://svn.gnome.org/viewvc/goffice?rev=2211&view=rev

Log:
2008-09-04  Morten Welinder  <terra gnome org>

	* goffice/utils/go-file.c (go_url_resolve_relative): Fix
	references to wrong URI.  Fixes #550898.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/goffice/utils/go-file.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Sep  4 20:36:00 2008
@@ -1,3 +1,9 @@
+goffice 0.7.2:
+
+Morten:
+	* Fix go_url_resolve_relative.  [#550898]
+
+--------------------------------------------------------------------------
 goffice 0.7.1:
 
 Jean:

Modified: trunk/goffice/utils/go-file.c
==============================================================================
--- trunk/goffice/utils/go-file.c	(original)
+++ trunk/goffice/utils/go-file.c	Thu Sep  4 20:36:00 2008
@@ -287,10 +287,10 @@
 
 	len = strlen (ref_uri);
 
-	/* FIXME: This doesn't work if rel_uri starts with a slash.  */
+	/* FIXME: This doesn't work if ref_uri starts with a slash.  */
 
 	uri = g_new (char, len + strlen (rel_uri) + 1);
-	memcpy (uri, rel_uri, len + 1);
+	memcpy (uri, ref_uri, len + 1);
 	while (len > 0 && uri[len - 1] != '/')
 		len--;
 	if (len == 0) {