dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix check on the GError returned by file_utils_filename_is_uri(). 

2007-05-14  Michael Natterer  <mitch@gimp.org>

	* app/file/file-utils.c (file_utils_filename_to_uri): fix check on
	the GError returned by file_utils_filename_is_uri().


svn path=/trunk/; revision=22490
This commit is contained in:
Michael Natterer 2007-05-14 21:17:10 +00:00 committed by Michael Natterer
parent 3ac7a2866d
commit c049787564
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-05-14 Michael Natterer <mitch@gimp.org>
* app/file/file-utils.c (file_utils_filename_to_uri): fix check on
the GError returned by file_utils_filename_is_uri().
2007-05-14 Michael Natterer <mitch@gimp.org>
* libgimpbase/gimpenv.c: #include <CoreServices/CoreServices.h>,

11
app/file/file-utils.c
View File

@ -100,8 +100,9 @@ file_utils_filename_to_uri (Gimp *gimp,
const gchar *filename,
GError **error)
{
gchar *absolute;
gchar *uri;
GError *temp_error = NULL;
gchar *absolute;
gchar *uri;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (filename != NULL, NULL);
@ -122,12 +123,14 @@ file_utils_filename_to_uri (Gimp *gimp,
return NULL;
}
}
else if (file_utils_filename_is_uri (filename, error))
else if (file_utils_filename_is_uri (filename, &temp_error))
{
return g_strdup (filename);
}
else if (error)
else if (temp_error)
{
g_propagate_error (error, temp_error);
return NULL;
}