1 files changed, 8 insertions, 7 deletions

diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
index 5d21f15..7be5af5 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
+++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
@@ -25,5 +25,7 @@
 #include <kglobalsettings.h>
-#include "kcolordialog.h"
+//#include "kcolordialog.h"
 #include "kcolorbtn.h"
 
+#include <opie/colordialog.h>
+
 KColorButton::KColorButton( QWidget *parent, const char *name )
@@ -36,3 +38,3 @@ KColorButton::KColorButton( QWidget *parent, const char *name )
 KColorButton::KColorButton( const QColor &c, QWidget *parent,
-                            const char *name )
+          const char *name )
   : QPushButton( parent, name ), col(c), dragFlag(false)
@@ -75,10 +77,9 @@ void KColorButton::chooseColor()
 {
-  if( KColorDialog::getColor( col) == QDialog::Rejected )
+  QColor newCol=OColorDialog::getColor( col);
+  if( newCol != QDialog::Rejected )
   {
-    return;
-  }
-
+  col=newCol;
   repaint( false );
   emit changed( col );
+  }
 }
-