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

Conflicts:
	trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp

diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index 11777a5,43ebea5..5ead482
--- 1/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@@ -30,11 -32,10 +32,12 @@@ QString XdxfPlugin::infoNote() const 
  }
  
  QList<Translation*> XdxfPlugin::searchWordList(QString word, int limit) {
+     stopped = false;
      QRegExp regWord(word);
 -    QList<Translation*> translations;
 +    regWord.setCaseSensitivity(Qt::CaseInsensitive);
      regWord.setPatternSyntax(QRegExp::Wildcard);
 +
 +    QList<Translation*> translations;
      QFile dictionaryFile(path);
      if(!dictionaryFile.open(QFile::ReadOnly | QFile::Text)) {
          qDebug()<<"Error: could not open file";
@@@ -126,12 -126,9 +129,14 @@@ bool XdxfPlugin::isAvailable() const 
      return true;
  }
  
 +void XdxfPlugin::setHash(uint _hash)
 +{
 +    this->_hash=_hash;
 +}
 +
  uint XdxfPlugin::hash() const
  {
 -    return 1;
 +   return _hash;
  }
+ 
+ Q_EXPORT_PLUGIN2(xdxf, XdxfPlugin)