From 2a9d0cf8c52a832c04729a4c65f07e6cd24eb19e Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Tue, 17 Aug 2010 09:49:48 +0000
Subject: Remove 'language' attribute.

---
 client/macrowindow.cc            | 6 ++----
 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 =
-- 
cgit v1.2.3