fixing mantis 885

3 files changed, 32 insertions, 59 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 74f46be8..a915f2d7 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -1880,7 +1880,7 @@ Thank you,
                           <property name="use_underline">True</property>
 
                           <child internal-child="image">
-                            <widget class="GtkImage" id="image16">
+                            <widget class="GtkImage" id="image37">
                               <property name="visible">True</property>
                               <property name="stock">gtk-new</property>
                               <property name="icon_size">1</property>
@@ -1932,7 +1932,7 @@ Thank you,
                           <property name="use_underline">True</property>
 
                           <child internal-child="image">
-                            <widget class="GtkImage" id="image17">
+                            <widget class="GtkImage" id="image38">
                               <property name="visible">True</property>
                               <property name="stock">gtk-delete</property>
                               <property name="icon_size">1</property>
@@ -3666,19 +3666,19 @@ Press ENTER to add the data.</atkproperty>
           <property name="spacing">0</property>
 
           <child>
-            <widget class="GtkButton" id="namespaceInsertButton">
+            <widget class="GtkButton" id="addButton">
               <property name="visible">True</property>
-              <property name="tooltip" translatable="yes">Add additional files to this namespace.</property>
+              <property name="tooltip" translatable="yes">Add content to the namespace</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-add</property>
               <property name="use_stock">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
-              <signal name="clicked" handler="on_namespaceInsertButton_clicked" object="namespaceContentFrame" last_modification_time="Mon, 23 May 2005 19:00:01 GMT"/>
+              <signal name="clicked" handler="on_namespaceInsertButton_clicked" last_modification_time="Tue, 23 Aug 2005 08:23:21 GMT"/>
             </widget>
             <packing>
               <property name="padding">0</property>
-              <property name="expand">True</property>
+              <property name="expand">False</property>
               <property name="fill">True</property>
             </packing>
           </child>
@@ -5466,7 +5466,7 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
               <property name="right_padding">0</property>
 
               <child>
-                <widget class="GtkComboBox" id="combobox1">
+                <widget class="GtkComboBox" id="namespaceInsertMetaTypeComboBox">
                   <property agent="glademm" name="cxx_visibility">public</property>
                   <property name="visible">True</property>
                   <property name="add_tearoffs">False</property>
@@ -5530,7 +5530,7 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
           </child>
 
           <child>
-            <widget class="GtkButton" id="button10">
+            <widget class="GtkButton" id="namespaceInsertAddButton">
               <property name="visible">True</property>
               <property name="tooltip" translatable="yes">Add the given description to the meta-data describing the uploaded file.</property>
               <property name="can_focus">True</property>
@@ -5538,7 +5538,7 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
               <property name="use_stock">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
-              <signal name="clicked" handler="on_metaDataDialogMetaDataAddButton_clicked" last_modification_time="Thu, 02 Jun 2005 12:44:47 GMT"/>
+              <signal name="clicked" handler="on_namespaceUpdateMetaDataDialogMetaDataAddButton_clicked" last_modification_time="Tue, 23 Aug 2005 08:41:20 GMT"/>
             </widget>
             <packing>
               <property name="padding">0</property>
@@ -5575,7 +5575,7 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
                   <property name="visible">True</property>
                   <property name="tooltip" translatable="yes">Select entries and use the context menu (right click) in order to delete keywords.</property>
                   <property name="can_focus">True</property>
-                  <property name="headers_visible">False</property>
+                  <property name="headers_visible">True</property>
                   <property name="rules_hint">True</property>
                   <property name="reorderable">True</property>
                   <property name="enable_search">True</property>
@@ -5664,7 +5664,7 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
                   <property name="shadow_type">GTK_SHADOW_IN</property>
 
                   <child>
-                    <widget class="GtkImage" id="image24">
+                    <widget class="GtkImage" id="namespaceInsertPreview">
                       <property agent="glademm" name="cxx_visibility">public</property>
                       <property name="visible">True</property>
                       <property name="xalign">0.5</property>
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index f5361266..1848755b 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -89,7 +89,8 @@ void createMetaDataListTreeView(GladeXML * xml,
     ECRS_getMetaData(init,
                      &publishMetaData,
                      metamodel);  
-  if (previewName == NULL)
+  if ( (previewName == NULL) ||
+       (init == NULL) )
     return;
   preview = glade_xml_get_widget(xml,
                                  previewName);
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,