Merge pull request #382 from UnitooTeam/master

Move connect action to main.cpp.  Default search text as parameter of…

1 files changed, 8 insertions, 5 deletions

diff --git a/main/main.cpp b/main/main.cpp
index cb1e2912..baec2707 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -81,14 +81,17 @@ int main(int argc, char *argv[]) {
   app.installTranslator(&translator);
   app.setLayoutDirection(QObject::tr("LTR") == "RTL" ? Qt::RightToLeft
                                                      : Qt::LeftToRight);
-  MainWindow w;
-
-  QObject::connect(&app, SIGNAL(aboutToQuit()), &w, SLOT(clearClipboard()));
+  MainWindow w(text);
 
   app.setActiveWindow(&w);
   app.setWindowIcon(QIcon(":artwork/icon.png"));
-  w.setApp(&app);
-  w.setText(text);
+
+  QObject::connect(&app, SIGNAL(aboutToQuit()), &w, SLOT(clearClipboard()));
+#if SINGLE_APP
+  QObject::connect(&app, SIGNAL(messageAvailable(QString)), &w,
+                   SLOT(messageAvailable(QString)));
+#endif
+
   w.show();
 
   return app.exec();