From 1d3cd38e88ae97dd6906f9818d52b9ef07bf057d Mon Sep 17 00:00:00 2001
From: lordjaxom <lordjaxom>
Date: Wed, 16 Jun 2004 18:50:57 +0000
Subject: - fixed disappearing Scrolltext when Message was displayed - fixed
 display-items "MenuScrollUp" and "MenuScrollDown" which didn't display   any
 other items than "Symbol" - fixed the above for all replay- and
 channel-symbols   (for all display-items that can be symbols there must be
 path, altpath or   both to tell the plugin if that item is to be drawn if the
 symbol is on,   off or in both cases) - fixed various memory leaks and
 missing destructions (valgrind rox) - fixed the image loaders to respect the
 alpha value and palette properly   (this hopefully also fixes the phenomenon
 that images "get lost" after some   time) - added display-item "Scrollbar" -
 SKINS and SKINS.de are now generated during the make

---
 common.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'common.c')

diff --git a/common.c b/common.c
index 4643b9f..5ec7970 100644
--- a/common.c
+++ b/common.c
@@ -1,5 +1,5 @@
 /*
- * $Id: common.c,v 1.9 2004/06/12 18:00:05 lordjaxom Exp $
+ * $Id: common.c,v 1.10 2004/06/16 18:46:50 lordjaxom Exp $
  */
 
 #include "data.h"
@@ -12,7 +12,8 @@ const string SectionNames[__SECTION_COUNT__] =
 
 const string ItemNames[__ITEM_COUNT__] = 
 	{ "Unknown", "Skin", "Background", "Text", "Scrolltext", "Image", "Rectangle",
-	  "Ellipse", "Slope", "Progress", "Logo", "Symbol", "MenuArea", "MenuItem" };
+	  "Ellipse", "Slope", "Progress", "Logo", "Symbol", "MenuArea", "MenuItem",
+		"Scrollbar" };
 
 const string DisplayNames[__DISPLAY_COUNT__] = 
 	{ "Always", "DateTimeF", "DateTime", "Date", "Time", "ChannelNumberName", 
@@ -131,10 +132,10 @@ bool ParseVar(const char *Text, const char *Name, string &Value){
 	return res;
 }
 
-bool ParseVar(const char *Text, const char *Name, tColor **Value) {
+bool ParseVar(const char *Text, const char *Name, tColor *Value) {
 	string value;
 	if (ParseVar(Text, Name, value) && value[0] == '#') {
-		*Value = new tColor(strtoul(value.c_str() + 1, NULL, 16));
+		*Value = (tColor)strtoul(value.c_str() + 1, NULL, 16);
 		return true;
 	}
 	return false;
-- 
cgit v1.2.3