callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: port gimp_tags_user_install() to GIO

Browse Source
This commit is contained in:
Michael Natterer
2014-07-28 12:12:21 +02:00
parent 57cecb54fb
commit afc469446f
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/core/gimp-tags.c
View File

@ -20,9 +20,6 @@
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <string.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <gegl.h> #include <gegl.h>
@ -73,7 +70,7 @@ gboolean
gimp_tags_user_install (void) gimp_tags_user_install (void)
{ {
GFile *file; GFile *file;
gchar *filename; GOutputStream *output;
GMarkupParser markup_parser; GMarkupParser markup_parser;
GimpXmlParser *xml_parser; GimpXmlParser *xml_parser;
const char *tags_locale; const char *tags_locale;
@ -106,8 +103,6 @@ gimp_tags_user_install (void)
g_string_append (tags_installer.buf, "<?xml version='1.0' encoding='UTF-8'?>\n"); g_string_append (tags_installer.buf, "<?xml version='1.0' encoding='UTF-8'?>\n");
g_string_append (tags_installer.buf, "<tags>\n"); g_string_append (tags_installer.buf, "<tags>\n");
file = gimp_data_directory_file ("tags", "gimp-tags-default.xml", NULL);
markup_parser.start_element = gimp_tags_installer_load_start_element; markup_parser.start_element = gimp_tags_installer_load_start_element;
markup_parser.end_element = gimp_tags_installer_load_end_element; markup_parser.end_element = gimp_tags_installer_load_end_element;
markup_parser.text = gimp_tags_installer_load_text; markup_parser.text = gimp_tags_installer_load_text;
@ -116,9 +111,10 @@ gimp_tags_user_install (void)
xml_parser = gimp_xml_parser_new (&markup_parser, &tags_installer); xml_parser = gimp_xml_parser_new (&markup_parser, &tags_installer);
file = gimp_data_directory_file ("tags", "gimp-tags-default.xml", NULL);
result = gimp_xml_parser_parse_gfile (xml_parser, file, &error); result = gimp_xml_parser_parse_gfile (xml_parser, file, &error);
g_object_unref (file); g_object_unref (file);
gimp_xml_parser_free (xml_parser); gimp_xml_parser_free (xml_parser);
if (! result) if (! result)
@ -129,22 +125,36 @@ gimp_tags_user_install (void)
g_string_append (tags_installer.buf, "\n</tags>\n"); g_string_append (tags_installer.buf, "\n</tags>\n");
filename = g_build_filename (gimp_directory (), GIMP_TAGS_FILE, NULL); file = gimp_directory_file (GIMP_TAGS_FILE, NULL);
result = g_file_set_contents (filename, tags_installer.buf->str, output = G_OUTPUT_STREAM (g_file_replace (file,
tags_installer.buf->len, &error); NULL, FALSE, G_FILE_CREATE_NONE,
NULL, &error));
g_free (filename); if (! output)
g_string_free (tags_installer.buf, TRUE);
if (! result)
{ {
g_warning ("Error while creating tags.xml: %s\n", error->message); g_printerr (_("Could not open '%s' for writing: %s"),
g_error_free (error); gimp_file_get_utf8_name (file), error->message);
return FALSE; result = FALSE;
}
else if (! g_output_stream_write_all (output,
tags_installer.buf->str,
tags_installer.buf->len,
NULL, NULL, &error) ||
! g_output_stream_close (output, NULL, &error))
{
g_printerr (_("Error writing '%s': %s"),
gimp_file_get_utf8_name (file), error->message);
result = FALSE;
} }
return TRUE; if (output)
g_object_unref (output);
g_clear_error (&error);
g_object_unref (file);
g_string_free (tags_installer.buf, TRUE);
return result;
} }
static void static void