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

Conflicts:
	data/icons/gui.qrc
	trunk/src/base/base.pro
	trunk/src/base/gui/MainWindow.cpp

diff --cc trunk/src/base/base.pro
index b929c80,d923732..79f0288
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -60,10 -62,10 +62,12 @@@ HEADERS += gui/MainWindow.h 
      ../includes/Notify.h \
      gui/TranslationTextEdit.h \
      ../includes/AccentsNormalizer.h \
 +    ../includes/DictDialog.h
- RESOURCES += \
-     translations.qrc \
-     ../../../data/gui.qrc
+     ../includes/DictDialog.h \
+     gui/DBusAdapter.h \
+     gui/NotifyManager.h
 -RESOURCES += ../../../data/icons/gui.qrc
++
++RESOURCES += ../../../data/gui.qrc
  unix { 
      # VARIABLES
      isEmpty(PREFIX):PREFIX = /usr

diff --cc trunk/src/base/gui/MainWindow.cpp
Simple merge

diff --cc trunk/src/base/gui/main.cpp
index 12a4625,8d154c2..71cd63a
--- 1/trunk/src/base/gui/main.cpp
--- 2/trunk/src/base/gui/main.cpp
+++ b/trunk/src/base/gui/main.cpp
@@@ -62,25 -66,19 +65,34 @@@ int main(int argc, char *argv[]) 
      qRegisterMetaType<QList<Translation*> >("QList<Translation*>");
      qRegisterMetaType<Notify>("Notify");
      qRegisterMetaType<Notify::NotifyType>("Notify::NotifyType");
 +
 +    QString locale = QLocale::system().name();
 +
 +    QTranslator qtTranslator;
 +    qtTranslator.load("qt_" + QLocale::system().name(),
 +    QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 +    a.installTranslator(&qtTranslator);
 +
 +    QTranslator myTranslator;
 +    if(locale == "pl_PL")
 +        myTranslator.load(":/translations/dict_pl");
 +    else
 +        myTranslator.load(":/translations/dict_en");
 +    a.installTranslator(&myTranslator);
 +
      Backbone backbone;
      MainWindow w(&backbone);
+ 
+     DBusAdapter* adapter = new DBusAdapter(&w);
+ 
+     QDBusConnection::sessionBus().registerObject("/mainWindow",
+                                                  &w);
+     QDBusConnection::sessionBus().registerService("com.comarch.mdictionary");
+ 
+ 
      w.show();
  
+ 
      if(search.count() > 0) {
          w.setExactSearch(true);
          w.searchExact(search[0]);

diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
Simple merge

diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.h
Simple merge