diff options
| author | deva <deva> | 2010-08-17 09:49:48 +0000 |
|---|---|---|
| committer | deva <deva> | 2010-08-17 09:49:48 +0000 |
| commit | 2a9d0cf8c52a832c04729a4c65f07e6cd24eb19e (patch) | |
| tree | a36c44b86c16d13718dfdef06b0de2f747292c98 | |
| parent | c1f4e947c513eada30a04c1c31c43af600b963b3 (diff) | |
Remove 'language' attribute.
| -rw-r--r-- | client/macrowindow.cc | 6 | ||||
| -rw-r--r-- | server/src/transactionhandler.cc | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/client/macrowindow.cc b/client/macrowindow.cc index b91a1fd..f0565c9 100644 --- a/client/macrowindow.cc +++ b/client/macrowindow.cc @@ -109,10 +109,8 @@ void MacroWindow::initMacro(QDomNode &node) ((ResumeWidget*)collapsedWidget())->setText(resume, state); } else if(elem.tagName() == "script") { - if(elem.attribute("language", "lua") == "lua") { - lua->runScript(elem.text(), NULL, "preload"); - } - + lua->runScript(elem.text(), NULL, "preload"); + } else if(elem.tagName() == "widgets") { if(mainwidget) { diff --git a/server/src/transactionhandler.cc b/server/src/transactionhandler.cc index 86f7853..29220b3 100644 --- a/server/src/transactionhandler.cc +++ b/server/src/transactionhandler.cc @@ -198,8 +198,9 @@ static std::string handleRequest(Transaction &transaction, Environment &env, std::vector< Script >::iterator spi = m->scripts.begin(); while(spi != m->scripts.end()) { - answer += " <script language=\"" + - spi->attributes["language"] + "\">"; + // answer += " <script language=\"" + + // spi->attributes["language"] + "\">"; + answer += " <script>"; if(spi->attributes.find("src") != spi->attributes.end()) { std::string file = |