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

app: change filename in gimp_vectors_import_file() to GFile

This commit is contained in:
Michael Natterer 2014-07-02 14:54:56 +02:00
parent 632b64fedf
commit 3687e1b32b
7 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/actions/vectors-commands.c
View File

@ -728,15 +728,15 @@ vectors_import_response (GtkWidget *widget,
if (response_id == GTK_RESPONSE_OK)
{
GtkFileChooser *chooser = GTK_FILE_CHOOSER (widget);
gchar *filename;
GFile *file;
GError *error = NULL;
vectors_import_merge = dialog->merge_vectors;
vectors_import_scale = dialog->scale_vectors;
filename = gtk_file_chooser_get_filename (chooser);
file = gtk_file_chooser_get_file (chooser);
if (gimp_vectors_import_file (dialog->image, filename,
if (gimp_vectors_import_file (dialog->image, file,
vectors_import_merge, vectors_import_scale,
GIMP_IMAGE_ACTIVE_PARENT, -1,
NULL, &error))
@ -752,7 +752,7 @@ vectors_import_response (GtkWidget *widget,
return;
}
g_free (filename);
g_object_unref (file);
g_object_set_data_full (G_OBJECT (dialog->image->gimp),
"gimp-vectors-import-folder",

6
app/pdb/paths-cmds.c
View File

@ -687,8 +687,12 @@ path_import_invoker (GimpProcedure *procedure,
if (success)
{
success = gimp_vectors_import_file (image, filename,
GFile *file = g_file_new_for_path (filename);
success = gimp_vectors_import_file (image, file,
merge, scale, NULL, -1, NULL, NULL);
g_object_unref (file);
}
return gimp_procedure_get_return_values (procedure, success,

10
app/pdb/vectors-cmds.c
View File

@ -1163,20 +1163,24 @@ vectors_import_from_file_invoker (GimpProcedure *procedure,
if (success)
{
GList *list, *vectors_list = NULL;
GFile *file = g_file_new_for_path (filename);
GList *vectors_list = NULL;
/* FIXME tree */
success = gimp_vectors_import_file (image, filename,
success = gimp_vectors_import_file (image, file,
merge, scale, NULL, -1,
&vectors_list, error);
g_object_unref (file);
if (success)
{
num_vectors = g_list_length (vectors_list);
if (num_vectors)
{
gint i;
GList *list;
gint i;
vectors_ids = g_new (gint32, num_vectors);

24
app/vectors/gimpvectors-import.c
View File

@ -93,7 +93,7 @@ typedef struct
static gboolean gimp_vectors_import (GimpImage *image,
const gchar *filename,
GFile *file,
const gchar *str,
gsize len,
gboolean merge,
@ -185,7 +185,7 @@ static GList * parse_path_data (const gchar *data);
/**
* gimp_vectors_import_file:
* @image: the #GimpImage to add the paths to
* @filename: name of a SVG file
* @file: a SVG file
* @merge: should multiple paths be merged into a single #GimpVectors object
* @scale: should the SVG be scaled to fit the image dimensions
* @position: position in the image's vectors stack where to add the vectors
@ -197,7 +197,7 @@ static GList * parse_path_data (const gchar *data);
**/
gboolean
gimp_vectors_import_file (GimpImage *image,
const gchar *filename,
GFile *file,
gboolean merge,
gboolean scale,
GimpVectors *parent,
@ -206,7 +206,7 @@ gimp_vectors_import_file (GimpImage *image,
GError **error)
{
g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
g_return_val_if_fail (filename != NULL, FALSE);
g_return_val_if_fail (G_IS_FILE (file), FALSE);
g_return_val_if_fail (parent == NULL ||
parent == GIMP_IMAGE_ACTIVE_PARENT ||
GIMP_IS_VECTORS (parent), FALSE);
@ -224,7 +224,7 @@ gimp_vectors_import_file (GimpImage *image,
g_return_val_if_fail (ret_vectors == NULL || *ret_vectors == NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
return gimp_vectors_import (image, filename, NULL, 0, merge, scale,
return gimp_vectors_import (image, file, NULL, 0, merge, scale,
parent, position,
ret_vectors, error);
}
@ -279,7 +279,7 @@ gimp_vectors_import_buffer (GimpImage *image,
static gboolean
gimp_vectors_import (GimpImage *image,
const gchar *filename,
GFile *file,
const gchar *str,
gsize len,
gboolean merge,
@ -310,8 +310,8 @@ gimp_vectors_import (GimpImage *image,
xml_parser = gimp_xml_parser_new (&markup_parser, &parser);
if (filename)
success = gimp_xml_parser_parse_file (xml_parser, filename, error);
if (file)
success = gimp_xml_parser_parse_gfile (xml_parser, file, error);
else
success = gimp_xml_parser_parse_buffer (xml_parser, str, len, error);
@ -368,10 +368,10 @@ gimp_vectors_import (GimpImage *image,
}
else
{
if (filename)
if (file)
g_set_error (error, GIMP_ERROR, GIMP_FAILED,
_("No paths found in '%s'"),
gimp_filename_to_utf8 (filename));
gimp_file_get_utf8_name (file));
else
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("No paths found in the buffer"));
@ -379,13 +379,13 @@ gimp_vectors_import (GimpImage *image,
success = FALSE;
}
}
else if (error && *error && filename) /* parser reported an error */
else if (error && *error && file) /* parser reported an error */
{
gchar *msg = (*error)->message;
(*error)->message =
g_strdup_printf (_("Failed to import paths from '%s': %s"),
gimp_filename_to_utf8 (filename), msg);
gimp_file_get_utf8_name (file), msg);
g_free (msg);
}

2
app/vectors/gimpvectors-import.h
View File

@ -23,7 +23,7 @@
gboolean gimp_vectors_import_file (GimpImage *image,
const gchar *filename,
GFile *file,
gboolean merge,
gboolean scale,
GimpVectors *parent,

6
tools/pdbgen/pdb/paths.pdb
View File

@ -595,8 +595,12 @@ sub path_import {
headers => [ qw("vectors/gimpvectors-import.h") ],
code => <<'CODE'
{
success = gimp_vectors_import_file (image, filename,
GFile *file = g_file_new_for_path (filename);
success = gimp_vectors_import_file (image, file,
merge, scale, NULL, -1, NULL, NULL);
g_object_unref (file);
}
CODE
);

10
tools/pdbgen/pdb/vectors.pdb
View File

@ -1144,20 +1144,24 @@ HELP
headers => [ qw("vectors/gimpvectors-import.h") ],
code => <<'CODE'
{
GList *list, *vectors_list = NULL;
GFile *file = g_file_new_for_path (filename);
GList *vectors_list = NULL;
/* FIXME tree */
success = gimp_vectors_import_file (image, filename,
success = gimp_vectors_import_file (image, file,
merge, scale, NULL, -1,
&vectors_list, error);
g_object_unref (file);
if (success)
{
num_vectors = g_list_length (vectors_list);
if (num_vectors)
{
gint i;
GList *list;
gint i;
vectors_ids = g_new (gint32, num_vectors);