Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 34 insertions, 0 deletions

diff --git a/opensuse/core/tdebase/kompmgr_use_defaults.diff b/opensuse/core/tdebase/kompmgr_use_defaults.diff
new file mode 100644
index 000000000..00863fc66
--- /dev/null
+++ b/opensuse/core/tdebase/kompmgr_use_defaults.diff
@@ -0,0 +1,34 @@
+Index: kwin/kcmkwin/kwinoptions/windows.cpp
+===================================================================
+--- kwin/kcmkwin/kwinoptions/windows.cpp.orig
++++ kwin/kcmkwin/kwinoptions/windows.cpp
+@@ -46,6 +46,7 @@
+ #include <kprocess.h>
+ #include <qtabwidget.h>
+ 
++#include <stdlib.h>
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -1524,6 +1525,8 @@ void KTranslucencyConfig::load( void )
+   movingWindowOpacity->setEnabled(movingWindowTransparency->isChecked());
+   dockWindowOpacity->setEnabled(dockWindowTransparency->isChecked());
+ 
++  if( !QFile::exists( QDir::homeDirPath() + "/.xcompmgrrc" ))
++    system( "/bin/cp /etc/opt/kde3/share/config/xcompmgrrc $HOME/.xcompmgrrc" );
+   KConfig conf_(QDir::homeDirPath() + "/.xcompmgrrc");
+   conf_.setGroup("xcompmgr");
+   
+Index: kwin/kompmgr/kompmgr.c
+===================================================================
+--- kwin/kompmgr/kompmgr.c.orig
++++ kwin/kompmgr/kompmgr.c
+@@ -2431,6 +2431,8 @@ loadConfig(char *filename){
+ 
+ 		strcat(filename, home);
+ 		strcat(filename, configfile);
++                if( access( filename, R_OK ) != 0 )
++                    system( "/bin/cp /etc/opt/kde3/share/config/xcompmgrrc $HOME/.xcompmgrrc" );
+ 	}
+ 
+ 	printf("trying '%s' as configfile\n\n", filename);