Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

[mdictionary] / trunk / src / base / backbone / backbone.cpp

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index d7ca916..d9eae98 100644 (file)
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -245,7 +245,6 @@ void Backbone::addDictionary(CommonDictInterface *dict, bool active) {
  void Backbone::addInternalDictionary(CommonDictInterface* dict, bool active) {
      dict->setHash(++_dictNum); // Hash must be uniqe in every session but not between
      _dicts[dict] = active;
-
      connect(dict, SIGNAL(settingsChanged()), this, SLOT(dictUpdated()));
      connect(dict, SIGNAL(notify(Notify::NotifyType,QString)), this,
              SIGNAL(notify(Notify::NotifyType,QString)));
@@ -255,6 +254,7 @@ void Backbone::addDictionary(CommonDictInterface *dict, bool active) {
 
  void Backbone::removeDictionary(CommonDictInterface *dict) {
      _dicts.remove(dict);
+     dict->clean();
      delete dict;
      dictUpdated();
 
@@ -498,14 +498,22 @@ void Backbone::searchHtml(QList<Translation *> translations) {
     QList<TranslationPtr> dummy;
     stopped = false;
     foreach(Translation* tr, translations) {
-        if(containsDict(tr->dict()) || !tr->dict())
+         if(containsDict(tr->dict()) || !tr->dict())
             dummy.append(TranslationPtr(tr));
+  /*      foreach(CommonDictInterface* dict, activeDicts()) {
+            Translation* trans = dict->getTranslationFor(tr->key());
+            if(trans)
+                dummy.append(TranslationPtr(trans));
+        } */
+    }
+    if(translations.size()>0) {
+        Translation *tr = translations.at(0);
         foreach(CommonDictInterface* dict, activeDicts()) {
             Translation* trans = dict->getTranslationFor(tr->key());
             if(trans)
                 dummy.append(TranslationPtr(trans));
         }
-  }
+    }
 
    _innerHtmlResult = QtConcurrent::mapped(dummy,
                                             &TranslationPtr::toHtml);