1 files changed, 510 insertions, 322 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index e7c1a63e..63d7622c 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -46,19 +46,102 @@
  */
 typedef struct SL {
   struct SL * next;
-  GtkWidget * treeview;
+  /**
+   * Reference to the glade XML context that was
+   * used to create the search page.
+   */
+  GladeXML * searchXML;
+
+  /**
+   * Reference to the glade XML context that was
+   * used to create the search label.
+   */
+  GladeXML * labelXML;
+
+  /**
+   * Tree view widget that is used to display the
+   * search results.
+   */
+  GtkTreeView * treeview;
+
+  /**
+   * Model of the tree view.
+   */
+  GtkTreeStore * tree;
+
+  /**
+   * The label used in the notebook page.
+   */
+  GtkLabel * tab_label;
+
+  /**
+   * The notebook page that is associated with this
+   * search.
+   */
   GtkWidget * searchpage;
-  GtkWidget * anonymityButton; /* FIXME: initialize! */
+
+  /**
+   * Path to the entry in the summary list
+   * for this search.
+   */
+  GtkTreeRowReference * summaryViewRowReference;
+
+  /**
+   * URI for this search.
+   */
   struct ECRS_URI * uri;
-  struct FSUI_SearchList * fsui_list; /* FIXME: initialize! */
+
+  /**
+   * String describing the search.
+   */
+  char * searchString;
+
+  /**
+   * Number of results received so far.
+   */
+  unsigned int resultsReceived;
+
+  /**
+   * FSUI search handle.
+   */
+  struct FSUI_SearchList * fsui_list; 
 } SearchList;
 
 typedef struct DL {
   struct DL * next;
+
+  /**
+   * URI of the download.
+   */
   struct ECRS_URI * uri;
+
+  /**
+   * Where is the download being saved to?
+   */
   char * filename;
-  GtkTreeRowReference * rr;
-  GtkTreeModel * model;
+
+  /**
+   * Path in the summary view for this download.
+   */
+  GtkTreeRowReference * summaryViewRowReference;
+
+  /**
+   * Search that this download belongs to.
+   * Maybe NULL.
+   */
+  struct SL * searchList;
+
+  /**
+   * Path in the search view that this
+   * download is represented by.  Maybe NULL
+   * if search has been closed or if download
+   * was initiated from URI without search.
+   */
+  GtkTreeRowReference * searchViewRowReference;
+
+  /**
+   * FSUI reference for the download.
+   */
   struct FSUI_DownloadList * fsui_list;
 } DownloadList;
 
@@ -74,40 +157,38 @@ static struct GE_Context * ectx;
 
 static struct GC_Configuration * cfg;
 
-
+/**
+ * The user has clicked the "SEARCH" button.
+ * Initiate a search.
+ */
 void on_fssearchbutton_clicked_fs(gpointer dummy2,
                                   GtkWidget * searchButton) {
   struct ECRS_URI * uri;
-  const char * ss;
-  const char * ns;
+  const char * searchString;
   gint pages;
-  const char * descStr;
-  char * ustring;
   gint i;
   SearchList * list;
-  GtkListStore * model;
-  GtkTreeModel * tmodel;
   GtkTreeIter iter;
   GtkWidget * searchKeywordGtkCB;
   GtkWidget * searchNamespaceGtkCB;
-  GtkWidget * entry;
-  GtkWidget * notebook;
-  GtkWidget * page;
+  GtkNotebook * notebook;
 
-  DEBUG_BEGIN();
   searchKeywordGtkCB
     = glade_xml_get_widget(getMainXML(),
                            "fssearchKeywordComboBoxEntry");
-  entry = gtk_bin_get_child(GTK_BIN(searchKeywordGtkCB));
-  ss = gtk_entry_get_text(GTK_ENTRY(entry));
-  if (ss == NULL) {
+  searchString = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(searchKeywordGtkCB))));
+  if (searchString == NULL) {
     GE_LOG(ectx,
            GE_ERROR | GE_USER | GE_IMMEDIATE,
            _("Need a keyword to search!\n"));
     return;
   }
+  /* add the keyword to the list of keywords that have
+     been used so far */
   i = gtk_combo_box_get_active(GTK_COMBO_BOX(searchKeywordGtkCB));
   if (i == -1) {
+    GtkListStore * model;
+
     model = GTK_LIST_STORE
       (gtk_combo_box_get_model
        (GTK_COMBO_BOX(searchKeywordGtkCB)));
@@ -115,18 +196,22 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
                            &iter);
     gtk_list_store_set(model,
                        &iter,
-                       0, ss,
+                       0, searchString,
                        -1);
   }
+  uri = NULL;
+  /* check for namespace search */
   searchNamespaceGtkCB
     = glade_xml_get_widget(getMainXML(),
                            "searchNamespaceComboBoxEntry");
-  tmodel = gtk_combo_box_get_model(GTK_COMBO_BOX(searchNamespaceGtkCB));
   if (TRUE == gtk_combo_box_get_active_iter(GTK_COMBO_BOX(searchNamespaceGtkCB),
                                             &iter)) {
+    const char * descStr;
+    const char * ns;
+
     ns = NULL;
     descStr = NULL;
-    gtk_tree_model_get(tmodel,
+    gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(searchNamespaceGtkCB)),
                        &iter,
                        NS_SEARCH_DESCRIPTION, &descStr,
                        NS_SEARCH_ENCNAME, &ns,
@@ -141,43 +226,47 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
       if (descStr == NULL)
         descStr = ns;
     }
-  }
-  if (ns != NULL) {
-    ustring = MALLOC(strlen(ss) + sizeof(EncName) +
-                     strlen(ECRS_URI_PREFIX) +
-                     strlen(ECRS_SUBSPACE_INFIX) + 10);
-    strcpy(ustring, ECRS_URI_PREFIX);
-    strcat(ustring, ECRS_SUBSPACE_INFIX);
-    strcat(ustring, ns);
-    strcat(ustring, "/");
-    strcat(ustring, ss);
-    uri = ECRS_stringToUri(ectx, ustring);
-    if (uri == NULL) {
-      GE_LOG(ectx,
-             GE_ERROR | GE_BULK | GE_USER,
-             _("Failed to create namespace URI from `%s'.\n"),
-             ustring);
+    if (ns != NULL) {
+      char * ustring;
+
+      ustring = MALLOC(strlen(searchString) + sizeof(EncName) +
+                       strlen(ECRS_URI_PREFIX) +
+                       strlen(ECRS_SUBSPACE_INFIX) + 10);
+      strcpy(ustring, ECRS_URI_PREFIX);
+      strcat(ustring, ECRS_SUBSPACE_INFIX);
+      strcat(ustring, ns);
+      strcat(ustring, "/");
+      strcat(ustring, searchString);
+      uri = ECRS_stringToUri(ectx, ustring);
+      if (uri == NULL) {
+        GE_LOG(ectx,
+               GE_ERROR | GE_BULK | GE_USER,
+               _("Failed to create namespace URI from `%s'.\n"),
+               ustring);
+      }
+      FREE(ustring);
     }
-    FREE(ustring);
-  } else {
-    uri = ECRS_parseCharKeywordURI(ectx, ss);
   }
   if (uri == NULL)
+    uri = ECRS_parseCharKeywordURI(ectx, searchString);
+  if (uri == NULL) {
+    GE_BREAK(ectx, 0);
     return;
+  }
   /* check if search is already running */
   notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "downloadNotebook");
-  pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
+    = GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
+                                        "downloadNotebook"));
+  pages = gtk_notebook_get_n_pages(notebook);
   list = search_head;
   while (list != NULL) {
     if (ECRS_equalsUri(list->uri,
                        uri)) {
       for (i=0;i<pages;i++) {
-        page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
-                                         i);
-        if (page == list->searchpage) {
-          gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook),
+        if (gtk_notebook_get_nth_page(notebook,
+                                      i)
+            == list->searchpage) {
+          gtk_notebook_set_current_page(notebook,
                                         i);
           ECRS_freeUri(uri);
           return;
@@ -188,35 +277,46 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
     list = list->next;
   }
   FSUI_startSearch(ctx,
-                   getAnonymityLevel(getMainXML(),
-                                     "searchAnonymitySelectionSpinButton"),
-                   1000, /* FIXME: max results */
-                   99 * cronYEARS, /* FIXME: timeout */
+                   getSpinButtonValue(getMainXML(),
+                                      "searchAnonymitySelectionSpinButton"),    
+                   getSpinButtonValue(getMainXML(),
+                                      "maxResultsSpinButton"),  
+                   getSpinButtonValue(getMainXML(),
+                                      "searchDelaySpinButton") * cronSECONDS,
                    uri);
 }
 
+/**
+ * This method is called when the user clicks on either
+ * the "CLOSE" button (at the bottom of the search page)
+ * or on the "CANCEL (X)" button in the TAB of the
+ * search notebook.  Note that "searchPage" can thus
+ * either refer to the main page in the tab or to the
+ * main entry of the tab label.
+ */ 
 void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
                                      GtkWidget * closeButton) {
   SearchList * list;
 
-  DEBUG_BEGIN();
   list = search_head;
   while (list != NULL) {
-    if (list->searchpage == searchPage)
+    if ( (list->searchpage == searchPage) ||
+         (list->tab_label == searchPage) )
       break;
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
   FSUI_stopSearch(ctx,
                   list->fsui_list);
-  DEBUG_END();
 }
 
+/**
+ * The abort button was clicked.  Abort the search.
+ */
 void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
                                      GtkWidget * closeButton) {
   SearchList * list;
 
-  DEBUG_BEGIN();
   list = search_head;
   while (list != NULL) {
     if (list->searchpage == searchPage)
@@ -226,25 +326,27 @@ void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
   GE_ASSERT(ectx, list != NULL);
   FSUI_abortSearch(ctx,
                    list->fsui_list);
-  DEBUG_END();
 }
 
 static void stopSearch(GtkTreeModel * model,
                        GtkTreePath * path,
                        GtkTreeIter * iter,
                        gpointer unused) {
-  struct FSUI_SearchList * s;
+  struct SL * s;
 
   s = NULL;
   gtk_tree_model_get(model,
                      iter,
-                     SER_SUM_FSUI, &s,
+                     SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
   if (s != NULL)
     FSUI_stopSearch(ctx,
-                    s);
+                    s->fsui_list);
 }
 
+/**
+ * The stop button in the search summary was clicked.
+ */
 void on_closeSearchSummaryButton_clicked_fs(GtkWidget * treeview,
                                             GtkWidget * closeButton) {
   GtkTreeSelection * selection;
@@ -260,18 +362,21 @@ static void abortSearch(GtkTreeModel * model,
                         GtkTreePath * path,
                         GtkTreeIter * iter,
                         gpointer unused) {
-  struct FSUI_SearchList * s;
+  struct SL * s;
 
   s = NULL;
   gtk_tree_model_get(model,
                      iter,
-                     SER_SUM_FSUI, &s,
+                     SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
   if (s != NULL)
     FSUI_abortSearch(ctx,
-                     s);
+                     s->fsui_list);
 }
 
+/**
+ * The abort button in the search summary was clicked.
+ */
 void on_abortSearchSummaryButton_clicked_fs(GtkWidget * treeview,
                                             GtkWidget * closeButton) {
   GtkTreeSelection * selection;
@@ -284,6 +389,42 @@ void on_abortSearchSummaryButton_clicked_fs(GtkWidget * treeview,
 }
 
 /**
+ * Update the number of results received for the given
+ * search in the summary and in the label of the tab.
+ */
+static void updateSearchSummary(struct SL * searchContext) {
+  GtkTreePath * path;
+  GtkTreeIter iter;
+  char * new_title;
+  GtkWidget * label;
+
+  path = gtk_tree_row_reference_get_path(searchContext->summaryViewRowReference);
+  if (TRUE != gtk_tree_model_get_iter(GTK_TREE_MODEL(search_summary),
+                                      &iter,
+                                      path)) {
+    GE_BREAK(ectx, 0);
+    return;
+  }
+  gtk_tree_path_free(path);
+  gtk_list_store_set(search_summary,
+                     &iter,
+                     SEARCH_SUMMARY_RESULT_COUNT, searchContext->resultsReceived,
+                     -1);
+  
+                          
+
+  /* update tab title with the number of results */
+  new_title =
+    g_strdup_printf("%s (%u)", 
+                    searchContext->searchString,
+                    searchContext->resultsReceived);
+  label = glade_xml_get_widget(searchContext->labelXML,
+                               "searchTabLabel");
+  gtk_label_set(label, new_title);
+  FREE(new_title);
+}
+
+/**
  * Add the given result to the model (search result
  * list).
  * 
@@ -297,85 +438,20 @@ void fs_search_result_received(struct SL * searchContext,
   char * name;
   char * mime;
   char * desc;
-  unsigned char * thumb;
-  size_t ts;
-  GdkPixbuf * pixbuf;
-  GdkPixbufLoader * loader;
   unsigned long long size;
   char * size_h;
   GtkTreeStore * model;
   GtkTreeIter iter;
-  unsigned int * file_count;
-  GtkWidget * tab_label;
-  const char * tab_title;
-  char * new_title;
-  struct ECRS_URI * euri;
 
-  DEBUG_BEGIN();
+  mime = getMimeTypeFromMetaData(info->meta);
+  desc = getDescriptionFromMetaData(info->meta);
+  name = getFileNameFromMetaData(info->meta);    
+  size = ECRS_isFileUri(info->uri) ? ECRS_fileSize(info->uri) : 0
+  pixbuf = getThumbnailFromMetaData(info->meta);
+  size_h = string_get_fancy_byte_size(size);
   model = GTK_TREE_STORE
     (gtk_tree_view_get_model
      (GTK_TREE_VIEW(searchContext->treeview)));
-  mime = ECRS_getFromMetaData(info->meta,
-                              EXTRACTOR_MIMETYPE);
-  if (mime == NULL)
-    mime = STRDUP(_("unknown"));
-  mime = validate_utf8(mime);
-  desc = ECRS_getFirstFromMetaData(info->meta,
-                                   EXTRACTOR_DESCRIPTION,
-                                   EXTRACTOR_GENRE,
-                                   EXTRACTOR_ALBUM,
-                                   EXTRACTOR_COMMENT,
-                                   EXTRACTOR_SUBJECT,
-                                   EXTRACTOR_FORMAT,
-                                   EXTRACTOR_SIZE,
-                                   EXTRACTOR_KEYWORDS,
-                                   -1);
-  if (desc == NULL)
-    desc = STRDUP("");
-  desc = validate_utf8(desc);
-  name = ECRS_getFirstFromMetaData(info->meta,
-                                   EXTRACTOR_FILENAME,
-                                   EXTRACTOR_TITLE,
-                                   EXTRACTOR_ARTIST,
-                                   EXTRACTOR_AUTHOR,
-                                   EXTRACTOR_PUBLISHER,
-                                   EXTRACTOR_CREATOR,
-                                   EXTRACTOR_PRODUCER,
-                                   EXTRACTOR_UNKNOWN,
-                                   -1);
-  if (name == NULL) {
-    name = STRDUP(_("no name given"));
-  } else {
-    char * dotdot;
-    
-    while (NULL != (dotdot = strstr(name, "..")))
-      dotdot[0] = dotdot[1] = '_';
-  }
-  name = validate_utf8(name);
-    
-  if (ECRS_isFileUri(info->uri)) 
-    size = ECRS_fileSize(info->uri);
-  else 
-    size = 0;
-  thumb = NULL;
-  ts = ECRS_getThumbnailFromMetaData(info->meta,
-                                     &thumb);
-  if (ts != 0) {
-    loader = gdk_pixbuf_loader_new();
-    gdk_pixbuf_loader_write(loader,
-                            (const guchar*) thumb,
-                            ts,
-                            NULL);
-    pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
-    gdk_pixbuf_loader_close(loader,
-                            NULL);
-    if (pixbuf != NULL)
-      g_object_ref(pixbuf);
-    UNREF(loader);
-  } else {
-    pixbuf = NULL;
-  }
-  size_h = string_get_fancy_byte_size(size);
   gtk_tree_store_append(model,
                         &iter,
                         NULL);  
@@ -392,82 +468,35 @@ void fs_search_result_received(struct SL * searchContext,
                      SEARCH_INTERNAL, searchContext,
                      -1);
   FREE(size_h);
-  FREE(mime);
-  FREE(desc);
   FREE(name);
-  FREENONNULL(thumb);
-
-  /* update tab title with the number of results */
-  file_count = (unsigned int *)
-      g_object_get_data(G_OBJECT(searchContext->searchpage), "file_count");
-  (*file_count)++;
-  tab_label = (GtkWidget *)
-      g_object_get_data(G_OBJECT(searchContext->searchpage), "label");
-  tab_title = (const char *)
-      g_object_get_data(G_OBJECT(searchContext->searchpage), "title");
-  new_title =
-      g_strdup_printf("%s%s%u%s", 
-                      tab_title, " (", *file_count, ")");
-  gtk_label_set(GTK_LABEL(tab_label), new_title);
-  FREE(new_title);
-
-  if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(search_summary),
-                                      &iter)) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
-
-  do {  
-    gtk_tree_model_get(GTK_TREE_MODEL(search_summary),
-                       &iter,
-                       SER_SUM_URI, &euri,
-                       -1);
-    if (ECRS_equalsUri(euri,
-                       uri)) {
-      gtk_list_store_set(GTK_LIST_STORE(search_summary),
-                         &iter,
-                         SER_SUM_COUNT, *file_count,
-                         -1);
-      DEBUG_END();
-      return;
-    }
-
-  } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(search_summary),
-                                    &iter));
+  FREE(desc);
+  FREE(mime);
+  /* UNREF pixbuf? */
+  searchContext->resultsReceived++;
+  updateSearchSummary(searchContext);
 }
 
-SearchList * 
+/**
+ * FSUI event: a search was started; create the
+ * tab and add an entry to the summary.
+ */
+struct SL * 
 fs_search_started(struct FSUI_SearchList * fsui_list,
                   const struct ECRS_URI * uri,
                   unsigned int anonymityLevel,
                   unsigned int resultCount,
                   const ECRS_FileInfo * results) {
-  GtkWidget * notebook;
-  GtkWidget * label;
-  GtkTreeIter iter;
-  SearchList * list;
-  char * tabtxt;
-  int i;
-  const char * dhead;
+  struct SL * list;
   gint pages;
   char * description;
-
-  notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "downloadNotebook");
-  list
-    = MALLOC(sizeof(SearchList));
-  list->searchpage
-    = makeSearchResultFrame(cfg,
-                            &list->treeview,
-                            &list->anonymityButton);
-  list->uri
-    = ECRS_dupUri(uri);
-  list->next
-    = search_head;
-  list->fsui_list 
-    = fsui_list;
-  search_head = list;
+  const char * dhead;
+  GtkContainer * window;
+  GtkTreeViewColumn * column;
+  GtkCellRenderer * renderer;
+  int col;
+  GtkNotebook * notebook;
+  GtkTreePath * path;
+  GtkTreeIter iter;
 
   description = ECRS_uriToString(uri);
   if (description == NULL) {
@@ -485,31 +514,169 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
                         ECRS_SUBSPACE_INFIX,
                         strlen(ECRS_SUBSPACE_INFIX)))
     dhead = &dhead[strlen(ECRS_SUBSPACE_INFIX)];
+  list
+    = MALLOC(sizeof(struct SL));
+  memset(list,
+         0,
+         sizeof(struct SL));
+  list->searchString
+    = STRDUP(dhead);
+  FREE(description);
+  list->uri
+    = ECRS_dupUri(uri);
+  list->fsui_list 
+    = fsui_list;
+  list->next
+    = search_head;
+  search_head = list;
+  list->searchXML
+    = glade_xml_new(getGladeFileName(),
+                    "searchResultsFrame",
+                    PACKAGE_NAME);
+  connectGladeWithPlugins(list->searchXML);
+  list->searchpage 
+    = extractMainWidgetFromWindow(list->searchXML,
+                                  "searchResultsFrame");
+  /* setup tree view and renderers */
+  list->treeview = GTK_TREE_VIEW(glade_xml_get_widget(list->searchXML,
+                                                      "searchResults"));
+
+  list->tree =
+    gtk_tree_store_new(SEARCH_NUM,
+                       G_TYPE_STRING, /* name */
+                       G_TYPE_UINT64,  /* size */
+                       G_TYPE_STRING,  /* human-readable size */
+                       G_TYPE_STRING, /* mime-type */
+                       G_TYPE_STRING, /* meta-data (some) */
+                       GDK_TYPE_PIXBUF, /* preview */   
+                       G_TYPE_POINTER,  /* url */
+                       G_TYPE_POINTER,  /* meta */
+                       G_TYPE_POINTER); /* internal: download info/NULL */
+
+  gtk_tree_view_set_model(list->treeview,
+                          GTK_TREE_MODEL(list->tree));
+  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(list->treeview),
+                              GTK_SELECTION_MULTIPLE);
 
-  tabtxt = STRDUP("foo"); /* FIXME! */
+  renderer = gtk_cell_renderer_text_new();
+  col = gtk_tree_view_insert_column_with_attributes(list->treeview,
+                                                    -1,
+                                                    _("Name"),
+                                                    renderer,
+                                                    "text", SEARCH_NAME,
+                                                    NULL);
+  column = gtk_tree_view_get_column(list->treeview,
+                                    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, SEARCH_NAME);
+
+  renderer = gtk_cell_renderer_text_new();
+  g_object_set (renderer, "xalign", 1.00, NULL);
+  col = gtk_tree_view_insert_column_with_attributes(list->treeview,
+                                                    -1,
+                                                    _("Size"),
+                                                    renderer,
+                                                    "text", SEARCH_HSIZE,
+                                                    NULL);
+  column = gtk_tree_view_get_column(list->treeview,
+                                    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, SEARCH_SIZE);
+
+  renderer = gtk_cell_renderer_text_new();
+  col = gtk_tree_view_insert_column_with_attributes(list->treeview,
+                                                    -1,
+                                                    _("Mime-type"),
+                                                    renderer,
+                                                    "text", SEARCH_MIME,
+                                                    NULL);
+  column = gtk_tree_view_get_column(list->treeview,
+                                    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, SEARCH_MIME);
+  
+  renderer = gtk_cell_renderer_text_new();
+  col = gtk_tree_view_insert_column_with_attributes(list->treeview,
+                                              -1,
+                                              _("Meta-data"),
+                                              renderer,
+                                              "text", SEARCH_DESC,
+                                              NULL);
+  column = gtk_tree_view_get_column(list->treeview,
+                                    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, SEARCH_DESC);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
+  if (YES != GC_get_configuration_value_yesno(cfg,
+                                              "GNUNET-GTK",
+                                              "DISABLE-PREVIEWS",
+                                              NO)) {
+    renderer = gtk_cell_renderer_pixbuf_new();
+    col = gtk_tree_view_insert_column_with_attributes(list->treeview,
+                                                      -1,
+                                                      _("Preview"),
+                                                      renderer,
+                                                      "pixbuf", SEARCH_PIXBUF,
+                                                      NULL);
+    column = gtk_tree_view_get_column(list->treeview,
+                                      col - 1);
+    gtk_tree_view_column_set_resizable(column, TRUE);
+    gtk_tree_view_column_set_reorderable(column, TRUE);
+    gtk_tree_view_column_set_resizable(column, TRUE);
+  }
+
+
+  /* add entry in search summary */
   gtk_list_store_append(search_summary,
                         &iter);
   gtk_list_store_set(search_summary,
                      &iter,
-                     SER_SUM_NAME, dhead,
-                     SER_SUM_COUNT, 0,
-                     SER_SUM_URI, ECRS_dupUri(uri),
+                     SEARCH_SUMMARY_NAME, dhead,
+                     SEARCH_SUMMARY_RESULT_COUNT, 0,
+                     SEARCH_SUMMARY_INTERNAL, list,
                      -1);
-  label = buildSearchTabLabel(list->searchpage, 
-                              dhead);
-  pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
-  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
-                           list->searchpage,
-                           label);
-  gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook),
-                                pages);
-  gtk_widget_show(notebook);
-  FREE(description);
+  path = gtk_tree_model_get_path(GTK_TREE_MODEL(search_summary),
+                                 &iter);
+  list->summaryViewRowReference
+    = gtk_tree_row_reference_new(GTK_TREE_MODEL(search_summary),
+                                 path);
+  gtk_tree_path_free(path);
+  
+  /* load label */
+  list->labelXML
+    = glade_xml_new(getGladeFileName(),
+                    "searchTabLabelWindow",
+                    PACKAGE_NAME);
+  list->tab_label 
+    = extractMainWidgetFromWindow(list->labelXML,
+                                  "searchTabLabelWindow");
+
+  /* process existing results */
   for (i=0;i<resultCount;i++)
     fs_search_result_received(list,
                               &results[i],
                               uri);
-  DEBUG_END();
+  
+  /* insert new page into search notebook */
+  notebook
+    = GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
+                                        "downloadNotebook"));  
+  pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
+  gtk_notebook_append_page(notebook,
+                           list->searchpage,
+                           list->tab_label);
+  gtk_notebook_set_current_page(notebook,
+                                pages);
+  gtk_widget_show(GTK_WIDGET(notebook)); /* may have been hidden! */
+  
   return list;
 }
 
@@ -548,15 +715,21 @@ static void freeIterSubtree(GtkTreeModel * tree,
                                     iter));
 }
 
+/**
+ * FSUI event: a search was stopped.  Remove the
+ * respective tab and its entry in the summary.
+ */
 void fs_search_stopped(SearchList * list) {
-  GtkWidget * notebook;
+  GtkNotebook * notebook;
   int index;
   int i;
   GtkTreeIter iter;
   struct ECRS_URI * euri;
   SearchList * prev;
+  DownloadList * downloads;
+  GtkTreePath * path;
 
-  DEBUG_BEGIN();
+  /* remove from linked list */
   if (search_head == list) {
     search_head = search_head->next;
   } else {
@@ -565,48 +738,53 @@ void fs_search_stopped(SearchList * list) {
       prev = prev->next;
     prev->next = list->next;
   }
+
+  /* remove links from download views */
+  downloads = download_head;
+  while (downloads != NULL) {
+    if (download->searchList == list) {
+      gtk_tree_row_reference_free(download->searchViewRowReference);
+      download->searchViewRowReference = NULL;
+      download->searchList = NULL;
+    }
+    downloads = downloads->next;
+  }
+
+  /* remove page from notebook */
   notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "downloadNotebook");
+    = GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
+                                        "downloadNotebook"));
   index = -1;
-  for (i=gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook))-1;i>=0;i--)
-    if (list->searchpage == gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+  for (i=gtk_notebook_get_n_pages(notebook)-1;i>=0;i--)
+    if (list->searchpage == gtk_notebook_get_nth_page(notebook,
                                                       i))
       index = i;
-  gtk_notebook_remove_page(GTK_NOTEBOOK(notebook),
+  GE_BREAK(ectx, index != -1);
+  gtk_notebook_remove_page(notebook,
                            index);
-#if 0
-  /* recursively free download tree */
+  
+  /* recursively free search model */
   if (gtk_tree_model_get_iter_first(list->model,
                                     &iter))
     freeIterSubtree(list->model,
                     &iter);
-#endif
-  if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(search_summary),
-                                      &iter)) {
-    GE_BREAK(ectx, 0);
-    ECRS_freeUri(list->uri);
-    FREE(list);
-    DEBUG_END();
-    return;
-  }
-  do {  
-    gtk_tree_model_get(GTK_TREE_MODEL(search_summary),
-                       &iter,
-                       SER_SUM_URI, &euri,
-                       -1);
-    if (ECRS_equalsUri(euri,
-                       list->uri)) {
-      gtk_list_store_remove(GTK_LIST_STORE(search_summary),
-                            &iter);
-      ECRS_freeUri(euri);
-      break;
-    }
-  } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(search_summary),
-                                    &iter));
+  
+  /* destroy entry in summary */
+  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
+  gtk_tree_model_get_iter(GTK_TREE_MODEL(search_summary),
+                          &iter,
+                          path);
+  gtk_tree_path_free(path);
+  gtk_list_store_remove(search_summary,
+                        &iter);
+
+  /* free list state itself */
+  UNREF(list->searchXML);
+  UNREF(list->labelXML);
+  gtk_tree_row_reference_free(list->summaryViewRowReference);
+  FREE(list->searchString);
   ECRS_freeUri(list->uri);
   FREE(list);
-  DEBUG_END();
 }
 
 
@@ -678,12 +856,16 @@ static int addFilesToDirectory
 }
 #endif
 
+
 /**
- * FIXME: somehow need way to pass
- * tree path for search into this download!
+ * A download has been started.  Add an entry
+ * to the search tree view (if applicable) and
+ * the download summary.
  */
 struct DL *
 fs_download_started(struct FSUI_DownloadList * fsui_dl,
+                    struct DL * dl_parent,
+                    struct SL * sl_parent,
                     unsigned long long total,
                     unsigned int anonymityLevel,
                     const ECRS_FileInfo * fi,
@@ -1209,25 +1391,28 @@ void on_abortDownloadButton_clicked_fs(void * unused,
 
 
 
+/* *************** startup/shutdown ****************** */
 
-
+/**
+ * Setup the summary views (in particular the models
+ * and the renderers).  
+ */
 void fs_search_start(struct GE_Context * e,
                      struct GC_Configuration * c) {
-  GtkWidget * searchCB;
-  GtkWidget * searchList;
+  GtkComboBoxEntry * searchCB;
+  GtkTreeView * searchList;
+  GtkTreeView * downloadList;
   GtkListStore * model;
   GtkCellRenderer * renderer;
   GtkTreeViewColumn * column;
   int col;
-  GtkWidget * downloadList;
   
   ectx = e;
   cfg = c;
-  DEBUG_BEGIN();
   searchCB
-    = glade_xml_get_widget(getMainXML(),
-                           "fssearchKeywordComboBoxEntry");
-
+    = GTK_COMBO_BOX_ENTRY(glade_xml_get_widget(getMainXML(),
+                                               "fssearchKeywordComboBoxEntry"));
+  
   model = gtk_list_store_new(NS_SEARCH_NUM,
                              G_TYPE_STRING, /* what we show */
                              G_TYPE_STRING, /* EncName of namespace */
@@ -1236,54 +1421,52 @@ void fs_search_start(struct GE_Context * e,
                              G_TYPE_INT);  /* Meta-data about namespace */
   gtk_combo_box_set_model(GTK_COMBO_BOX(searchCB),
                           GTK_TREE_MODEL(model));
-  gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(searchCB),
+  gtk_combo_box_entry_set_text_column(searchCB,
                                       NS_SEARCH_DESCRIPTION);
-  searchList = glade_xml_get_widget(getMainXML(),
-                                    "activeSearchesSummary");
+  searchList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
+                                                  "activeSearchesSummary"));
   search_summary =
     gtk_list_store_new(SER_SUM_NUM,
                        G_TYPE_STRING, /* name */
                        G_TYPE_INT,    /* # results */
-                       G_TYPE_POINTER,  /* internal: FSUI search list */
-                       G_TYPE_POINTER);  /* internal: uri */
-  gtk_tree_view_set_model(GTK_TREE_VIEW(searchList),
+                       G_TYPE_POINTER);  /* internal: search list */
+  gtk_tree_view_set_model(searchList,
                           GTK_TREE_MODEL(search_summary));
+  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(searchList),
+                              GTK_SELECTION_MULTIPLE);
+
   renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(searchList),
-                                              -1,
-                                              _("Query"),
-                                              renderer,
-                                              "text", SER_SUM_NAME,
+  col = gtk_tree_view_insert_column_with_attributes(searchList,
+                                                    -1,
+                                                    _("Query"),
+                                                    renderer,
+                                                    "text", SERARCH_SUMMARY_NAME,
                                               NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(searchList),
+  column = gtk_tree_view_get_column(searchList,
                                     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, SER_SUM_NAME);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(searchList),
-                                              col - 1),
-                                              TRUE);
+  gtk_tree_view_column_set_resizable(column, TRUE);
   renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(searchList),
-                                              -1,
-                                              _("Results"),
-                                              renderer,
-                                              "text", SER_SUM_COUNT,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(searchList),
+  col = gtk_tree_view_insert_column_with_attributes(searchList,
+                                                    -1,
+                                                    _("Results"),
+                                                    renderer,
+                                                    "text", SERARCH_SUMMARY_RESULT_COUNT,
+                                                    NULL);
+  column = gtk_tree_view_get_column(searchList,
                                     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, SER_SUM_COUNT);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(searchList),
-                                              col - 1),
-                                              TRUE);
+  gtk_tree_view_column_set_resizable(column, TRUE);
 
 
-  downloadList = glade_xml_get_widget(getMainXML(),
-                                      "activeDownloadsList");
+  downloadList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
+                                                    "activeDownloadsList"));
   download_summary =
     gtk_tree_store_new(DOWNLOAD_NUM,
                        G_TYPE_STRING, /* name (full-path file name) */
@@ -1291,68 +1474,73 @@ void fs_search_start(struct GE_Context * e,
                        G_TYPE_UINT64,  /* size */
                        G_TYPE_STRING, /* human readable size */
                        G_TYPE_INT,  /* progress */
-                       G_TYPE_STRING, /* uri */
-                       G_TYPE_POINTER,  /* url */
-                       G_TYPE_POINTER, /* internal: gtk tree path / NULL */
-                       G_TYPE_POINTER); /* directory path if file is inside a dir */
-  gtk_tree_view_set_model(GTK_TREE_VIEW(downloadList),
+                       G_TYPE_STRING, /* uri as string */
+                       G_TYPE_POINTER); /* internal download list ptr */
+  gtk_tree_view_set_model(downloadList,
                           GTK_TREE_MODEL(download_summary));
+  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(downloadList),
+                              GTK_SELECTION_MULTIPLE);
   renderer = gtk_cell_renderer_progress_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
-                                              -1,
-                                              _("Name"),
-                                              renderer,
-                                              "value", DOWNLOAD_PROGRESS,
-                                              "text", DOWNLOAD_SHORTNAME,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList),
+  col = gtk_tree_view_insert_column_with_attributes(downloadList,
+                                                    -1,
+                                                    _("Name"),
+                                                    renderer,
+                                                    "value", DOWNLOAD_PROGRESS,
+                                                    "text", DOWNLOAD_SHORTNAME,
+                                                    NULL);
+  column = gtk_tree_view_get_column(downloadList,
                                     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, DOWNLOAD_PROGRESS);
   /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList),
-                                              col - 1),
-                                              TRUE);
+  gtk_tree_view_column_set_resizable(column, TRUE);
   renderer = gtk_cell_renderer_text_new();
   g_object_set (renderer, "xalign", 1.00, NULL);
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
-                                              -1,
-                                              _("Size"),
-                                              renderer,
-                                              "text", DOWNLOAD_HSIZE,
-                                              NULL);
+  col = gtk_tree_view_insert_column_with_attributes(downloadList,
+                                                    -1,
+                                                    _("Size"),
+                                                    renderer,
+                                                    "text", DOWNLOAD_HSIZE,
+                                                    NULL);
   
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList),
+  column = gtk_tree_view_get_column(downloadList,
                                     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, DOWNLOAD_SIZE);
   /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList),
-                                              col - 1),
-                                              TRUE);
+  gtk_tree_view_column_set_resizable(column, TRUE);
   renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
-                                              -1,
-                                              _("URI"),
-                                              renderer,
-                                              "text", DOWNLOAD_URISTRING,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList),
+  col = gtk_tree_view_insert_column_with_attributes(downloadList,
+                                                    -1,
+                                                    _("URI"),
+                                                    renderer,
+                                                    "text", DOWNLOAD_URISTRING,
+                                                    NULL);
+  column = gtk_tree_view_get_column(downloadList,
                                     col - 1);
   gtk_tree_view_column_set_resizable(column, TRUE);
   gtk_tree_view_column_set_reorderable(column, TRUE);
   /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList),
-                                              col - 1),
-                                              TRUE);
-  DEBUG_END();
+  gtk_tree_view_column_set_resizable(column, TRUE);
 }
 
+/**
+ * Shutdown.
+ */
 void fs_search_stop() {
+  GtkComboBox * searchCB;
+  GtkListStore * model;
+
+  searchCB
+    = GTK_COMBO_BOX(glade_xml_get_widget(getMainXML(),
+                                         "fssearchKeywordComboBoxEntry"));
+  model = gtk_combo_box_get_model(searchCB);
+  /* FIXME: iterate over model entries
+     and free URIs and MetaData! */
 }