1 files changed, 50 insertions, 39 deletions

diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index cb32959c..6cbab5f5 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -56,7 +56,7 @@ void createMetaDataListTreeView(GladeXML * xml,
                                 const char * name,
                                 const char * previewName,
                                 const struct ECRS_MetaData * init) {
-  GtkWidget * metaList;
+  GtkTreeView * metaList;
   GtkListStore * metamodel;
   GtkCellRenderer * renderer;
   GtkWidget * preview;
@@ -73,47 +73,39 @@ void createMetaDataListTreeView(GladeXML * xml,
                          G_TYPE_INT,
                          G_TYPE_STRING,
                          G_TYPE_STRING);
-  metaList = glade_xml_get_widget(xml,
-                                  name);
+  metaList = GTK_TREE_VIEW(glade_xml_get_widget(xml,
+                                                name));
+  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(metaList),
+                              GTK_SELECTION_MULTIPLE);
   renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
-                                              -1,
-                                              _("Category"),
-                                              renderer,
-                                              "text", META_STYPE,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(metaList),
+  col = gtk_tree_view_insert_column_with_attributes(metaList,
+                                                    -1,
+                                                    _("Category"),
+                                                    renderer,
+                                                    "text", META_STYPE,
+                                                    NULL);
+  column = gtk_tree_view_get_column(metaList,
                                     col - 1);
   gtk_tree_view_column_set_resizable(column, TRUE);
   gtk_tree_view_column_set_clickable(column, TRUE);
   gtk_tree_view_column_set_reorderable(column, TRUE);
   gtk_tree_view_column_set_sort_column_id(column, META_STYPE);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(metaList),
-                                              col - 1),
-                                              TRUE);
   renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
-                                              -1,
-                                              _("Value"),
-                                              renderer,
-                                              "text", META_VALUE,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(metaList),
+  col = gtk_tree_view_insert_column_with_attributes(metaList,
+                                                    -1,
+                                                    _("Value"),
+                                                    renderer,
+                                                    "text", META_VALUE,
+                                                    NULL);
+  column = gtk_tree_view_get_column(metaList,
                                     col - 1);
   gtk_tree_view_column_set_resizable(column, TRUE);
   gtk_tree_view_column_set_clickable(column, TRUE);
   gtk_tree_view_column_set_reorderable(column, TRUE);
   gtk_tree_view_column_set_sort_column_id(column, META_VALUE);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(metaList),
-                                              col - 1),
-                                              TRUE);
-  gtk_tree_view_set_model(GTK_TREE_VIEW(metaList),
+  gtk_tree_view_set_model(metaList,
                           GTK_TREE_MODEL(metamodel));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(metaList)),
-                              GTK_SELECTION_MULTIPLE);
+
   if (init != NULL)
     ECRS_getMetaData(init,
                      &publishMetaData,
@@ -168,7 +160,7 @@ static int publishKeyword(const char * data,
 void createKeywordListTreeView(GladeXML * xml,
                                const char * name,
                                const struct ECRS_URI * init) {
-  GtkWidget * keywordList;
+  GtkTreeView * keywordList;
   GtkListStore * keymodel;
   GtkCellRenderer * renderer;
   GtkTreeViewColumn * column;
@@ -177,26 +169,25 @@ void createKeywordListTreeView(GladeXML * xml,
   keymodel
     = gtk_list_store_new(1,
                         G_TYPE_STRING);
-  keywordList = glade_xml_get_widget(xml,
-                                     name);
+  keywordList = GTK_TREE_VIEW(glade_xml_get_widget(xml,
+                                                   name));
+  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(keywordList),
+                              GTK_SELECTION_MULTIPLE);
   renderer = gtk_cell_renderer_text_new();
-  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(keywordList),
+  gtk_tree_view_insert_column_with_attributes(keywordList,
                                               -1,
                                               _("Keyword"),
                                               renderer,
                                               "text", 0,
                                               NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(keywordList),
+  column = gtk_tree_view_get_column(keywordList,
                                     0);
   gtk_tree_view_column_set_resizable(column, TRUE);
   gtk_tree_view_column_set_clickable(column, TRUE);
   gtk_tree_view_column_set_reorderable(column, TRUE);
   gtk_tree_view_column_set_sort_column_id(column, 0);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_set_model(GTK_TREE_VIEW(keywordList),
+  gtk_tree_view_set_model(keywordList,
                           GTK_TREE_MODEL(keymodel));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(keywordList)),
-                              GTK_SELECTION_MULTIPLE);
   if (init != NULL)
     ECRS_getKeywordsFromUri(init,
                             &publishKeyword,
@@ -322,6 +313,26 @@ void handleMetaDataListUpdate(GladeXML * xml,
   DEBUG_END();
 }
 
+static void removeRow(GtkTreeModel * model,
+                      GtkTreePath * path,
+                      GtkTreeIter * iter,
+                      gpointer unused) {
+  gtk_list_store_remove(GTK_LIST_STORE(model),
+                        iter);
+}
+
+void handleListRemove(GladeXML * xml,                   
+                      const char * listName) {
+  GtkWidget * list;
+
+  list = glade_xml_get_widget(xml,
+                              listName);
+  ggc_tree_selection_selected_foreach
+    (gtk_tree_view_get_selection(GTK_TREE_VIEW(list)),
+     &removeRow,
+     NULL);  
+}
+
 struct ECRS_MetaData * getMetaDataFromList(GladeXML * xml,
                                            const char * name,
                                            const char * previewName) {
@@ -587,7 +598,7 @@ const char * getEntryLineValue(GladeXML * xml,
                                const char * widgetName) {
   GtkBin * line;
   GtkEntry * entry;
-
+  
   line = GTK_BIN(glade_xml_get_widget(xml,
                                       widgetName));
   entry = GTK_ENTRY(gtk_bin_get_child(line));