Rolled back a couple of nasties from a bad patch...oops! Added author of the

last code, Jason Kivlighn from his patch to fix cc namespacing...

diff --git a/AUTHORS b/AUTHORS
index f9b3dfa37529e750baf45c4dda04ef2e726d973d..0b197e31208247bceb54c38e23baf291e2f4de17 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -102,4 +102,4 @@ Michael Wybrow
 Daniel Yacob
 David Yip
 Masatake Yamato
-
+Jason Kivlighn

diff --git a/src/dialogs/rdf.cpp b/src/dialogs/rdf.cpp
index cf3cd581f8d45ed6d90d0e3a59dd8cdb94c3f8b3..1e26a79c45d1c1e9507858345a39887e34bc7115 100644 (file)
--- a/src/dialogs/rdf.cpp
+++ b/src/dialogs/rdf.cpp
@@ -23,7 +23,6 @@
 #include "xml/repr.h"
 #include "rdf.h"
 #include "sp-item-group.h"
-#include "prefs-utils.h"
 
 /*
 
@@ -977,20 +976,6 @@ struct rdf_entity_default_t {
 struct rdf_entity_default_t rdf_defaults[] = {
     { "format",      "image/svg+xml", },
     { "type",        "http://purl.org/dc/dcmitype/StillImage", },
-    { "title",       "", },
-    { "date",        "", },
-    { "creator",     "", },
-    { "rights",      "", },
-    { "publisher",   "", },
-    { "identifier",  "", },
-    { "source",      "", },
-    { "relation",    "", },
-    { "language",    "", },
-    { "subject",     "", },
-    { "coverage",    "", },
-    { "description", "", },
-    { "contributor", "", },
-    { "license_uri", "", },
     { NULL,          NULL, }
 };
 
@@ -1019,11 +1004,8 @@ rdf_set_defaults ( SPDocument * doc )
         struct rdf_work_entity_t * entity = rdf_find_entity ( rdf_default->name );
         g_assert ( entity != NULL );
 
-        //get default matedata defined by user preferences
-        const gchar * text = prefs_get_string_attribute ("options.defaultmetadata", rdf_default->name);
-
         if ( rdf_get_work_entity ( doc, entity ) == NULL ) {
-            rdf_set_work_entity ( doc, entity, text ? text : rdf_default->text );
+            rdf_set_work_entity ( doc, entity, rdf_default->text );
         }
     }
 }

diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index d6fea990d81d3af23af10a6ed4fceb863b16c6da..8a04640e1c9518a164a859e3ed18d7f57bbab1e6 100644 (file)
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -208,7 +208,6 @@ static char const preferences_skeleton[] =
 "    <group id=\"transform\" stroke=\"1\" rectcorners=\"1\" pattern=\"1\" gradient=\"1\" />\n"
 "    <group id=\"kbselection\" inlayer=\"1\" onlyvisible=\"1\" onlysensitive=\"1\" />\n"
 "    <group id=\"selection\" layerdeselect=\"1\" />\n"
-"    <group id=\"defaultmetadata\" title=\"\" date=\"\" format=\"\" type=\"\" creator=\"\" rights=\"\" publisher=\"\" identifier=\"\" source=\"\" relation=\"\" language=\"\" subject=\"\" coverage=\"\" description=\"\" contributor=\"\" license=\"0\" license_uri=\"\" inkscapedefaults=\"1\" />\n"
 "    <group id=\"createbitmap\"/>\n"
 "    <group id=\"compassangledisplay\" value=\"0\"/>\n"
 "    <group id=\"maskobject\" topmost=\"1\" remove=\"1\"/>\n"