[gimp/metadata-browser: 17/44] Revert "Refactored xmp_model_set_scalar_property to use xmp_model_set_property"

[Roman Joost <romanofski src gnome org>]

commit 6243468d08f607a02be084ae47e944ed12493719
Author: Roman Joost <roman bromeco de>
Date:   Sun Sep 25 16:34:14 2011 +1000

    Revert "Refactored xmp_model_set_scalar_property to use xmp_model_set_property"
    
    This reverts commit 82b2a949c0470ec9dcf9621ca690c3e4c3046399. The reason
    for this revert is, because I think it is easier to operate on the
    string representation of the value while the user is changing it in the
    editor. If the XMPModel is serialized again, we have to make sure we
    merge the changed value with the raw value. In this way, we can also
    make sure to keep the raw value as it was during import time.

 plug-ins/metadata/xmp-model.c |   66 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 58 insertions(+), 8 deletions(-)
---
diff --git a/plug-ins/metadata/xmp-model.c b/plug-ins/metadata/xmp-model.c
index 8c7eba3..e2a4183 100644
--- a/plug-ins/metadata/xmp-model.c
+++ b/plug-ins/metadata/xmp-model.c
@@ -951,17 +951,67 @@ xmp_model_set_scalar_property (XMPModel    *xmp_model,
                                const gchar *property_name,
                                const gchar *property_value)
 {
-  const gchar **value;
+  XMPSchema    *schema;
+  XMPProperty  *property = NULL;
+  GtkTreeIter   iter;
+  GtkTreeIter   child_iter;
+  int           i;
+  gchar       **value;
+
+  g_return_val_if_fail (xmp_model != NULL, FALSE);
+  g_return_val_if_fail (schema_name != NULL, FALSE);
+  g_return_val_if_fail (property_name != NULL, FALSE);
+  g_return_val_if_fail (property_value != NULL, FALSE);
+  schema = find_xmp_schema_by_uri (xmp_model, schema_name);
+  if (! schema)
+    schema = find_xmp_schema_prefix (xmp_model, schema_name);
+
+  if (! schema)
+    return FALSE;
 
-  value = g_new (const gchar *, 2);
+  if (! find_iter_for_schema (xmp_model, schema, &iter))
+    add_known_schema (xmp_model, schema, &iter);
+
+  if (schema->properties != NULL)
+    for (i = 0; schema->properties[i].name != NULL; ++i)
+      if (! strcmp (schema->properties[i].name, property_name))
+        {
+          property = &(schema->properties[i]);
+          break;
+        }
+
+  if (property != NULL)
+    {
+      find_and_remove_property (xmp_model, property, &iter);
+    }
+  else
+    {
+      property = g_new (XMPProperty, 1);
+      property->name     = g_strdup (property_name);
+      property->type     = XMP_TYPE_TEXT;
+      property->editable = TRUE;
+
+      xmp_model->custom_properties =
+        g_slist_prepend (xmp_model->custom_properties, property);
+    }
+
+  value = g_new (gchar *, 2);
   value[0] = g_strdup (property_value);
   value[1] = NULL;
-
-  return xmp_model_set_property (xmp_model,
-                                 XMP_TYPE_TEXT,
-                                 schema_name,
-                                 property_name,
-                                 value);
+  gtk_tree_store_append (GTK_TREE_STORE (xmp_model), &child_iter, &iter);
+  gtk_tree_store_set (GTK_TREE_STORE (xmp_model), &child_iter,
+                      COL_XMP_NAME, g_strdup (property_name),
+                      COL_XMP_VALUE, value[0],
+                      COL_XMP_VALUE_RAW, value,
+                      COL_XMP_TYPE_XREF, property,
+                      COL_XMP_WIDGET_XREF, NULL,
+                      COL_XMP_EDITABLE, property->editable,
+                      COL_XMP_EDIT_ICON, NULL,
+                      COL_XMP_VISIBLE, TRUE,
+                      COL_XMP_WEIGHT, PANGO_WEIGHT_NORMAL,
+                      COL_XMP_WEIGHT_SET, FALSE,
+                      -1);
+  return TRUE;
 }
 
 /**