dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improved error handling.

Browse source 
2008-03-11  Sven Neumann  <sven@gimp.org>

	* plug-ins/uri/uri-backend-gio.c: improved error handling.


svn path=/trunk/; revision=25086
This commit is contained in:
Sven Neumann 2008-03-11 21:34:00 +00:00 committed by Sven Neumann
parent 675f734b15
commit 48c3389a18
2 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2008-03-11 Sven Neumann <sven@gimp.org>
* plug-ins/uri/uri-backend-gio.c: improved error handling.
2008-03-11 Sven Neumann <sven@gimp.org>
* INSTALL

49
plug-ins/uri/uri-backend-gio.c
View file

@ -1,6 +1,9 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* URI plug-in, GIO backend
* Copyright (C) 2008 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@ -34,7 +37,6 @@ typedef enum
UPLOAD
} Mode;
/* local function prototypes */
static gchar * get_protocols (void);
static gboolean copy_uri (const gchar *src_uri,
@ -42,14 +44,9 @@ static gboolean copy_uri (const gchar *src_uri,
Mode mode,
GError **error);
/* private variables */
static gchar *supported_protocols = NULL;
/* public functions */
gboolean
uri_backend_init (const gchar *plugin_name,
gboolean run,
@ -105,14 +102,18 @@ uri_backend_load_image (const gchar *uri,
GimpRunMode run_mode,
GError **error)
{
gchar *dest_uri;
gboolean success;
gchar *dest_uri = g_filename_to_uri (tmpname, NULL, error);
dest_uri = g_filename_to_uri (tmpname, NULL, NULL);
success = copy_uri (uri, dest_uri, DOWNLOAD, error);
g_free (dest_uri);
if (dest_uri)
{
gboolean success = copy_uri (uri, dest_uri, DOWNLOAD, error);
return success;
g_free (dest_uri);
return success;
}
return FALSE;
}
gboolean
@ -121,14 +122,18 @@ uri_backend_save_image (const gchar *uri,
GimpRunMode run_mode,
GError **error)
{
gchar *src_uri;
gboolean success;
gchar *src_uri = g_filename_to_uri (tmpname, NULL, error);
src_uri = g_filename_to_uri (tmpname, NULL, NULL);
success = copy_uri (src_uri, uri, UPLOAD, error);
g_free (src_uri);
if (src_uri)
{
gboolean success = copy_uri (src_uri, uri, UPLOAD, error);
return success;
g_free (src_uri);
return success;
}
return FALSE;
}
@ -224,13 +229,19 @@ copy_uri (const gchar *src_uri,
Mode mode,
GError **error)
{
GVfs *vfs;
GVfs *vfs = g_vfs_get_default ();
GFile *src_file;
GFile *dest_file;
gboolean success;
vfs = g_vfs_get_default ();
if (! g_vfs_is_active (vfs))
{
g_set_error (error, 0, 0, "Initialization of GVfs failed");
return FALSE;
}
src_file = g_vfs_get_file_for_uri (vfs, src_uri);
dest_file = g_vfs_get_file_for_uri (vfs, dest_uri);