1 files changed, 16 insertions, 9 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index f026d07e..cb292e22 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -46,14 +46,12 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
   gint i;
   SearchList * list;
   GtkTreeIter iter;
-  GtkWidget * searchKeywordGtkCB;
+  GtkComboBox * searchKeywordGtkCB;
   GtkWidget * searchNamespaceGtkCB;
   GtkNotebook * notebook;
 
-  searchKeywordGtkCB
-    = glade_xml_get_widget(getMainXML(),
-                           "fssearchKeywordComboBoxEntry");
-  searchString = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(searchKeywordGtkCB))));
+  searchString = getEntryLineValue(getMainXML(),
+                                   "fssearchKeywordComboBoxEntry");
   if (searchString == NULL) {
     GE_LOG(ectx,
            GE_ERROR | GE_USER | GE_IMMEDIATE,
@@ -62,13 +60,14 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
   }
   /* add the keyword to the list of keywords that have
      been used so far */
-  i = gtk_combo_box_get_active(GTK_COMBO_BOX(searchKeywordGtkCB));
+  searchKeywordGtkCB
+    = GTK_COMBO_BOX(glade_xml_get_widget(getMainXML(),
+                                         "fssearchKeywordComboBoxEntry"));
+  i = gtk_combo_box_get_active(searchKeywordGtkCB);
   if (i == -1) {
     GtkListStore * model;
 
-    model = GTK_LIST_STORE
-      (gtk_combo_box_get_model
-       (GTK_COMBO_BOX(searchKeywordGtkCB)));
+    model = GTK_LIST_STORE(gtk_combo_box_get_model(searchKeywordGtkCB));
     gtk_list_store_prepend(model,
                            &iter);
     gtk_list_store_set(model,
@@ -608,6 +607,14 @@ static void freeIterSubtree(GtkTreeModel * tree,
 }
 
 /**
+ * FSUI event: a search was aborted.
+ * Update views accordingly.
+ */
+void fs_search_aborted(SearchList * list) {
+  /* FIXME: show aborted status somehow! */
+}
+
+/**
  * FSUI event: a search was stopped.  Remove the
  * respective tab and its entry in the summary.
  */