From 9e2a2daf56fd87e773050583df11a32e04a6a447 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 20 Jun 2008 09:34:36 +0000
Subject: Changed internal tagname attribute from 'type' to 'tagname'.

---
 server/src/macroparser.cc     | 4 ++--
 server/src/widgetgenerator.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'server/src')

diff --git a/server/src/macroparser.cc b/server/src/macroparser.cc
index 6f4798e..9175c07 100644
--- a/server/src/macroparser.cc
+++ b/server/src/macroparser.cc
@@ -195,7 +195,7 @@ void MacroParser::startTag(std::string name, std::map< std::string, std::string>
     assert(m); // No macro is currently available, cannot create window!
   
     m->window.attributes = attributes;
-    m->window.attributes["type"] = name;
+    m->window.attributes["tagname"] = name;
 
     Widget *current = &(m->window);
     widgetstack.push_back(current);
@@ -211,7 +211,7 @@ void MacroParser::startTag(std::string name, std::map< std::string, std::string>
 
     Widget w;
     w.attributes = attributes;
-    w.attributes["type"] = name;
+    w.attributes["tagname"] = name;
 
     Widget *parent = widgetstack.back();
     parent->widgets.push_back(w);
diff --git a/server/src/widgetgenerator.cc b/server/src/widgetgenerator.cc
index 4061600..32fdaba 100644
--- a/server/src/widgetgenerator.cc
+++ b/server/src/widgetgenerator.cc
@@ -72,7 +72,7 @@ static std::string send_macro_widget(Macro &macro,
   }
 
   while(p != widget.attributes.end()) {
-    if(p->first != "type" && p->first != "map") {
+    if(p->first != "tagname" && p->first != "map") {
       result += " " + p->first + "=\"" + p->second + "\"";
     }
     p++;
-- 
cgit v1.2.3