update to trunk

(bzr r12588.1.32)

2 files changed, 19 insertions, 2 deletions

diff --git a/src/xml/node.h b/src/xml/node.h
index e83d8a7b7..c1977b0a8 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -19,6 +19,7 @@
 #define SEEN_INKSCAPE_XML_NODE_H
 
 #include <glibmm/value.h>
+#include <glibmm/ustring.h>
 #include "gc-anchored.h"
 #include "util/list.h"
 
@@ -194,6 +195,7 @@ public:
      */
     virtual void setContent(gchar const *value)=0;
     
+    //@{
     /**
      * @brief Change an attribute of this node
      *
@@ -204,7 +206,19 @@ public:
      * @param is_interactive Ignored
      */
     virtual void setAttribute(gchar const *key, gchar const *value, bool is_interactive=false)=0;
-    
+
+    void setAttribute(char const *key, Glib::ustring const &value, bool is_interactive=false)
+    {
+        setAttribute(key, value.empty() ? NULL : value.c_str(), is_interactive);
+    }
+
+    void setAttribute(Glib::ustring const &key, Glib::ustring const &value, bool is_interactive=false)
+    {
+        setAttribute( key.empty()   ? NULL : key.c_str(),
+                      value.empty() ? NULL : value.c_str(), is_interactive);
+    }
+    //@}
+
     /**
      * @brief Directly set the integer GQuark code for the name of the node
      *
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 54eff00bc..0319bb5e3 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -334,7 +334,10 @@ Document *sp_repr_read_file (const gchar * filename, const gchar *default_ns)
     xmlSubstituteEntitiesDefault(1);
 
     g_return_val_if_fail (filename != NULL, NULL);
-    g_return_val_if_fail (Inkscape::IO::file_test( filename, G_FILE_TEST_EXISTS ), NULL);
+    if (!Inkscape::IO::file_test( filename, G_FILE_TEST_EXISTS )) {
+        g_warning("Can't open file: %s (doesn't exist)", filename);
+        return NULL;
+    }
     /* fixme: A file can disappear at any time, including between now and when we actually try to
      * open it.  Get rid of the above test once we're sure that we correctly handle
      * non-existence. */