From atlantik-devel  Tue Oct 14 00:10:48 2003
From: kde () office ! kde ! org
Date: Tue, 14 Oct 2003 00:10:48 +0000
To: atlantik-devel
Subject: [atlantik-cvs] CVS: kdeaddons/atlantikdesigner/designer editor.cpp,
X-MARC-Message: https://marc.info/?l=atlantik-devel&m=106609034503129

Update of /home/kde/kdeaddons/atlantikdesigner/designer
In directory office:/tmp/cvs-serv10965/designer

Modified Files:
      Tag: KDE_3_1_BRANCH
	editor.cpp main.cpp 
Log Message:
backport: fix bug #66008

Index: editor.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/editor.cpp,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -d -r1.34.2.1 -r1.34.2.2
--- editor.cpp	23 Jun 2003 03:59:57 -0000	1.34.2.1
+++ editor.cpp	14 Oct 2003 00:10:45 -0000	1.34.2.2
@@ -871,8 +871,10 @@
 	{
 		if ((*it).name() == groupName)
 		{
-			estate->setColor((*it).fgColor());
-			estate->setBgColor((*it).bgColor());
+			if ( (*it).fgColor().isValid() )
+				estate->setColor((*it).fgColor());
+			if ( (*it).bgColor().isValid() )
+				estate->setBgColor((*it).bgColor());
 		
 			estate->update();
 

Index: main.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/main.cpp,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- main.cpp	23 Jun 2003 04:01:38 -0000	1.3.2.1
+++ main.cpp	14 Oct 2003 00:10:45 -0000	1.3.2.2
@@ -9,7 +9,7 @@
 {
 	KAboutData aboutData(
 	           "atlantikdesigner",
-	           I18N_NOOP("Atlantik Designer"), "1.0.1",
+	           I18N_NOOP("Atlantik Designer"), "1.0.2",
 	           I18N_NOOP("Atlantik gameboard designer"),
 	           KAboutData::License_GPL,
 	           I18N_NOOP("(c) 2002 Jason Katz-Brown"),

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-cvs