=== modified file 'src/preferences-skeleton.h' --- src/preferences-skeleton.h 2010-07-26 00:34:06 +0000 +++ src/preferences-skeleton.h 2012-12-05 22:48:00 +0000 @@ -315,6 +315,10 @@ " clips=\"16711935\"" // 00ff00ff " masks=\"65535\"/>\n" // 0x0000ffff " \n" +" \n" +" \n" +" \n" " \n" " \n" " \n" === modified file 'src/ui/dialog/ocaldialogs.cpp' --- src/ui/dialog/ocaldialogs.cpp 2011-06-13 19:15:33 +0000 +++ src/ui/dialog/ocaldialogs.cpp 2012-12-05 22:48:00 +0000 @@ -468,9 +468,16 @@ xmlDoc *doc = NULL; xmlNode *root_element = NULL; + int parse_options = XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR; // do not use XML_PARSE_NOENT ! see bug lp:1025185 + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool allowNetAccess = prefs->getBool("/options/externalresources/xml/allow_net_access", false); + if (!allowNetAccess) { + parse_options |= XML_PARSE_NONET; + } + doc = xmlReadIO ((xmlInputReadCallback) vfs_read_callback, - (xmlInputCloseCallback) gnome_vfs_close, from_handle, uri.c_str(), NULL, - XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR); + (xmlInputCloseCallback) gnome_vfs_close, from_handle, uri.c_str(), NULL, parse_options); + if (doc == NULL) { sp_ui_error_dialog(_("Server supplied malformed Clip Art feed")); g_warning("Failed to parse %s\n", uri.c_str()); === modified file 'src/xml/repr-io.cpp' --- src/xml/repr-io.cpp 2012-08-17 22:47:17 +0000 +++ src/xml/repr-io.cpp 2012-12-05 22:48:00 +0000 @@ -289,12 +289,18 @@ XmlSource src; if ( (src.setFile(filename) == 0) ) { + int parse_options = XML_PARSE_HUGE; // do not use XML_PARSE_NOENT ! see bug lp:1025185 + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool allowNetAccess = prefs->getBool("/options/externalresources/xml/allow_net_access", false); + if (!allowNetAccess) { + parse_options |= XML_PARSE_NONET; + } doc = xmlReadIO( XmlSource::readCb, XmlSource::closeCb, &src, localFilename, src.getEncoding(), - XML_PARSE_NOENT | XML_PARSE_HUGE); + parse_options); } }