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

diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index 15c509e,78a3b19..d397d5d
--- 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
@@@ -128,16 -115,14 +130,13 @@@ void XdxfPlugin::stop() 
      stopped=true;
  }
  
- QDialog* XdxfPlugin::loadDialog() {
-      path="dict.xdxf";
+ DictDialog* XdxfPlugin::dictDialog() {
+      return NULL;
  }
  
- QDialog* XdxfPlugin::settingsDialog() {
-     path="dict.xdxf";
- }
  
  CommonDictInterface* XdxfPlugin::getNew(const Settings*) const {
 -  // CommonDictInterface *commonDictInterface= new
 -    ;
 +  return new XdxfPlugin();
  }
  
  bool XdxfPlugin::isAvailable() const {