From d24cc97f5d9b081e38fc2f2cbacdc2dfacc38e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <desowin@gmail.com>
Date: Tue, 17 Mar 2009 12:54:46 +0100
Subject: [PATCH] add error reporting to create_preset_from_xml_file

---
 gui.c    |  9 +++++++--
 preset.c | 18 ++++++++++--------
 preset.h |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/gui.c b/gui.c
index 889cdce..cc66bbe 100644
--- a/gui.c
+++ b/gui.c
@@ -665,9 +665,14 @@ static void action_open_preset_cb(GtkAction *action)
 
     gboolean loaded = FALSE;
     while (!loaded && gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+        GError *error = NULL;
         gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-        Preset *preset = create_preset_from_xml_file(filename);
-        if (preset != NULL) {
+        Preset *preset = create_preset_from_xml_file(filename, &error);
+        if (error) {
+            show_error_message(window, error->message);
+            g_error_free(error);
+            error = NULL;
+        } else if (preset != NULL) {
             apply_preset_to_gui(preset);
 
             gtk_widget_hide(dialog);
diff --git a/preset.c b/preset.c
index b31dff0..2f27c76 100644
--- a/preset.c
+++ b/preset.c
@@ -118,21 +118,23 @@ static void XMLCALL text_cb(void *data, const char* text, int len)
 
 /**
  *  \param filename valid path to file
+ *  \param error return location for an error
  *
  *  Tries to open file pointed by path, then parses it.
  *
  *  \return Preset which must be freed using preset_free, or NULL on error.
  **/
-Preset *create_preset_from_xml_file(gchar *filename)
+Preset *create_preset_from_xml_file(gchar *filename, GError **error)
 {
     GFile *file;
-    GError *error = NULL;
+    GError *err = NULL;
     gchar *contents;
 
     file = g_file_new_for_path(filename);
-    if (g_file_get_contents(filename, &contents, NULL, &error) == FALSE) {
-        g_message("Failed to get %s contents: %s", filename, error->message);
-        g_error_free(error);
+    if (g_file_get_contents(filename, &contents, NULL, &err) == FALSE) {
+        g_message("Failed to get %s contents: %s", filename, err->message);
+        *error = g_error_copy(err);
+        g_error_free(err);
         g_object_unref(file);
         return NULL;
     }
@@ -151,9 +153,9 @@ Preset *create_preset_from_xml_file(gchar *filename)
     XML_SetCharacterDataHandler(p, text_cb);
 
     if (XML_Parse(p, contents, strlen(contents), XML_TRUE) != XML_STATUS_OK) {
-        g_warning("Parse error at line %d:\n%s",
-                  (int)XML_GetCurrentLineNumber(p),
-                  XML_ErrorString(XML_GetErrorCode(p)));
+        g_set_error(error, 0, 0, "Parse error at line %d:\n%s",
+                    (int)XML_GetCurrentLineNumber(p),
+                    XML_ErrorString(XML_GetErrorCode(p)));
         preset_free(ad->preset);
         g_slice_free(AppData, ad);
         g_free(contents);
diff --git a/preset.h b/preset.h
index 241f284..d8b110f 100644
--- a/preset.h
+++ b/preset.h
@@ -30,7 +30,7 @@ typedef struct {
     GList *params;
 } Preset;
 
-Preset *create_preset_from_xml_file(gchar *filename);
+Preset *create_preset_from_xml_file(gchar *filename, GError **error);
 Preset *create_preset_from_data(GString *data);
 void preset_free(Preset *preset);