diff options
| author | Jon Phillips <jon@fabricatorz.com> | 2007-08-14 07:31:58 +0000 |
|---|---|---|
| committer | kidproto <kidproto@users.sourceforge.net> | 2007-08-14 07:31:58 +0000 |
| commit | 02883171ad78481e5c58885f9f24befb76aeb43e (patch) | |
| tree | d16fda6818b35d7ea024c5a441b4d0c152ef4708 /src | |
| parent | Applied patches for default metadata and for fix on creative commons namespace. (diff) | |
| download | inkscape-02883171ad78481e5c58885f9f24befb76aeb43e.tar.gz inkscape-02883171ad78481e5c58885f9f24befb76aeb43e.zip | |
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...
(bzr r3465)
Diffstat (limited to 'src')
| -rw-r--r-- | src/dialogs/rdf.cpp | 20 | ||||
| -rw-r--r-- | src/preferences-skeleton.h | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/src/dialogs/rdf.cpp b/src/dialogs/rdf.cpp index cf3cd581f..1e26a79c4 100644 --- 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 d6fea990d..8a04640e1 100644 --- 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" |