1 files changed, 19 insertions, 47 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 8c8ece20..a11ee771 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -654,6 +654,14 @@ static void initiateUpload(GtkTreeModel * model,
   }
 } 
 
+void on_namespaceUpdateMetaDataDialogMetaDataAddButton_clicked(GtkWidget * dummy1,
+                                                               GtkWidget * dummy2) {
+  handleMetaDataListUpdate(metaXML,
+                           "namespaceInsertMetaTypeComboBox",
+                           "metaDataValueEntry",
+                           "metaDataTreeView");
+}
+
 void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
                                       GtkWidget * dummy2) {
   const char * identifierName;
@@ -662,16 +670,10 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
   GtkWidget * nameLine;
   GtkWidget * page;
   GtkWidget * notebook;
-  GtkWidget * metaList;
   GtkWidget * dialog;
   GtkWidget * spin;
   GtkWidget * update;
-  GtkListStore * metamodel;
-  GtkCellRenderer * renderer;
-  GtkTreeIter iter;
   struct ECRS_MetaData * meta;
-  EXTRACTOR_KeywordType type;
-  char * mvalue;
   HashCode512 nextId;
   GtkWidget * contentList;
   GtkTreeSelection * selection;
@@ -716,34 +718,17 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
 
   metaXML
     = glade_xml_new(getGladeFileName(),
-                    "namespaceMetaDataDialog",
+                    "namespaceInsertDialog",
                     PACKAGE_NAME);
   connectGladeWithPlugins(metaXML);
+  createMetaDataListTreeView(metaXML,
+                             "metaDataTreeView",
+                             "namespaceInsertPreview",
+                             NULL);
+  createMetaTypeComboBox(metaXML,
+                         "namespaceInsertMetaTypeComboBox");
   dialog = glade_xml_get_widget(metaXML,
-                                "namespaceMetaDataDialog");
-  metamodel
-    = gtk_list_store_new(META_NUM,
-                         G_TYPE_INT,
-                         G_TYPE_STRING,
-                         G_TYPE_STRING);
-  metaList = glade_xml_get_widget(metaXML,
-                                  "namespaceMetaDataDialogMetaDataList");
-  renderer = gtk_cell_renderer_text_new();
-  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
-                                              -1,
-                                              _("Category"),
-                                              renderer,
-                                              "text", META_STYPE,
-                                              NULL);
-  renderer = gtk_cell_renderer_text_new();
-  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
-                                              -1,
-                                              _("Value"),
-                                              renderer,
-                                              "text", META_VALUE,
-                                              NULL);
-  gtk_tree_view_set_model(GTK_TREE_VIEW(metaList),
-                          GTK_TREE_MODEL(metamodel));
+                                "namespaceInsertDialog");
   gtk_dialog_set_default_response(GTK_DIALOG(dialog),
                                   GTK_RESPONSE_OK);
   if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
@@ -772,21 +757,9 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
       return;
     }
 
-    meta = ECRS_createMetaData();
-    if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(metamodel),
-                                      &iter)) {
-      do {      
-        gtk_tree_model_get(GTK_TREE_MODEL(metamodel),
-                           &iter,
-                           META_TYPE, &type,
-                           META_VALUE, &mvalue,
-                           -1);
-        ECRS_addToMetaData(meta,
-                           type,
-                           mvalue);
-      } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(metamodel),
-                                        &iter));
-    }
+    meta = getMetaDataFromList(metaXML,
+                               "metaDataTreeView",
+                               "namespaceInsertPreview");
     spin = glade_xml_get_widget(metaXML,
                                 "anonymitySpinButton");    
     cls.anonymityLevel
@@ -814,7 +787,6 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
       cls.nextId = &nextId;
     }
     cls.meta = meta;
-
     gtk_tree_selection_selected_foreach
       (selection,
        &initiateUpload,