6 files changed, 15 insertions, 27 deletions
diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt
index 840c5afcf..df0b79f88 100644
--- a/twin/data/CMakeLists.txt
+++ b/twin/data/CMakeLists.txt
@@ -22,13 +22,13 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd
+    twin.upd twinsticky.upd twiniconify.upd
     twin_focus1.upd twinupdatewindowsettings.upd
     twin_focus2.upd twin_fsp_workarounds_1.upd
   DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( PROGRAMS
-    pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
+    pluginlibFix.pl twin_focus1.sh twin_focus2.sh
   DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( FILES
diff --git a/twin/data/Makefile.am b/twin/data/Makefile.am
index 0a2dab482..64ce6ab81 100644
--- a/twin/data/Makefile.am
+++ b/twin/data/Makefile.am
@@ -16,9 +16,9 @@ METASOURCES = AUTO
 sounddir= $(kde_sounddir)
 sound_DATA = pop.wav
 
-update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
+update_DATA = twin.upd twinsticky.upd twiniconify.upd twin_focus1.upd \
         twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd
-update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
+update_SCRIPTS = pluginlibFix.pl twin_focus1.sh twin_focus2.sh
 updatedir = $(kde_datadir)/tdeconf_update
 
 twin_default_rules_DATA = fsp_workarounds_1.twinrules
diff --git a/twin/data/twin3_plugin.pl b/twin/data/twin3_plugin.pl
deleted file mode 100644
index f5234bcce..000000000
--- a/twin/data/twin3_plugin.pl
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-foreach (<>) {
-    if(/^PluginLib=twin_(.*)$/) {
-        print "PluginLib=twin3_$1\n"; 
-        next;
-    }
-    print $_;
-}
diff --git a/twin/data/twin3_plugin.upd b/twin/data/twin3_plugin.upd
deleted file mode 100644
index 7194b5641..000000000
--- a/twin/data/twin3_plugin.upd
+++ /dev/null
@@ -1,4 +0,0 @@
-Id=trinity.2
-File=twinrc
-Options=overwrite
-Script=twin3_plugin.pl,perl
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp
index 1afde0bee..c37abc81d 100644
--- a/twin/data/update_default_rules.cpp
+++ b/twin/data/update_default_rules.cpp
@@ -13,8 +13,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdeinstance.h>
+#include <tdestandarddirs.h>
 
 int main( int argc, char* argv[] )
     {
diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp
index e52f8c760..d4b525691 100644
--- a/twin/data/update_window_settings.cpp
+++ b/twin/data/update_window_settings.cpp
@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <netwm_def.h>
 #include <tdeconfig.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <dcopclient.h>
 
 struct SessionInfo
@@ -82,14 +82,14 @@ void loadFakeSessionInfo( TDEConfig* config )
         info->maximized = config->readNumEntry( TQString("maximize")+n, 0 );
         info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 );
         info->desktop = config->readNumEntry( TQString("desktop")+n, 0 );
-        info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE );
-        info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE );
-        info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE );
-        info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE  );
-        info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE  );
-        info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE  );
-        info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE  );
-        info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE  );
+        info->minimized = config->readBoolEntry( TQString("iconified")+n, false );
+        info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false );
+        info->shaded = config->readBoolEntry( TQString("shaded")+n, false );
+        info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false  );
+        info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false  );
+        info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false  );
+        info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false  );
+        info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false  );
         info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1());
         info->active = false;
         info->fake = true;