From: Bartosz Szatkowski <bulislaw@linux.com>
Date: Mon, 30 Aug 2010 13:36:44 +0000 (+0200)
Subject: Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=00f9c51c866f1502fa4fb6eafd0d29bb53f79a40;p=mdictionary

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

Conflicts:
	trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
---

00f9c51c866f1502fa4fb6eafd0d29bb53f79a40
diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
index a2f1115,80b2d53..acd17de
--- a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
@@@ -37,18 -37,19 +37,19 @@@ GoogleSettingsDialog::GoogleSettingsDia
      int actualLangTo=1;
      int actualLangFrom=1;
  
-     if(langTo=="")
-         langTo="pl";
-     if(langFrom=="")
-         langFrom="en";
- 
-     _langTo=languages.key(langTo);
-     _langFrom=languages.key(langFrom);
+     if(pluginSettings==0) {
+         _langTo=languages.key("pl");
+         _langFrom=languages.key("en");
+     }
+     else {
+         _langTo=languages.key(pluginSettings->value("lang_to"));
+         _langFrom=languages.key(pluginSettings->value("lang_from"));
+     }
  
      #ifdef Q_WS_MAEMO_5
 -        changeLangButton=new
 -                         QPushButton(
 -                                 QIcon::fromTheme("general_refresh"),tr(""));
 +
 +        changeLangButton=new QPushButton(
 +                                 QIcon::fromTheme("general_refresh"), "");
      #else
          changeLangButton=new QPushButton(
                  QIcon::fromTheme("object-flip-vertical"),tr(""));