From: Mateusz Półrola <mateusz.polrola@comarch.pl>
Date: Mon, 16 Aug 2010 11:54:35 +0000 (+0200)
Subject: Merge branch 'gui'
X-Git-Tag: 0.4~45
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=04a206780e8c28968a94c694927cfeeb0d6b9cba;p=mdictionary

Merge branch 'gui'

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

04a206780e8c28968a94c694927cfeeb0d6b9cba
diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 4d3aa55,4d7828d..2e37889
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -202,7 -288,10 +285,10 @@@ Settings* XdxfPlugin::settings() 
      return _settings;
  }
  
 -bool XdxfPlugin::isCached()
 +bool XdxfPlugin::isCached() {
+ {
+     if(_settings->value("cached") == "true")
+         return true;
      return false;
  }