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

Conflicts:
	src/plugins/stardict/StarDictPlugin.cpp

diff --cc src/plugins/stardict/StarDictPlugin.cpp
index 87928cb,2ffed4e..8685766
--- 1/src/plugins/stardict/StarDictPlugin.cpp
--- 2/src/plugins/stardict/StarDictPlugin.cpp
+++ b/src/plugins/stardict/StarDictPlugin.cpp
@@@ -144,12 -100,10 +144,11 @@@ QString StarDictPlugin::search(QString 
      return "";
  }
  
- void StarDictPlugin::parseIfoFile()
- {
+ void StarDictPlugin::parseIfoFile() {
      QFile file(settings()->value("path"));
      if (!file.open(QIODevice::ReadOnly)) {
 -        return;
 +        // TODO notification
 +        return ;
      }
      QTextStream in(&file);
      while (!in.atEnd()) {