Hello community,
here is the log from the commit of package kdebase3
checked in at Thu Oct 26 20:07:41 CEST 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-10-24 10:10:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-24 18:21:07.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Oct 24 18:20:56 CEST 2006 - dmueller@suse.de
+
+- update WM configuration patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.DmCBYg/_old 2006-10-26 20:07:00.000000000 +0200
+++ /var/tmp/diff_new_pack.DmCBYg/_new 2006-10-26 20:07:00.000000000 +0200
@@ -51,7 +51,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 22
+Release: 25
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -364,7 +364,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 151
+Release: 154
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1472,6 +1472,8 @@
%endif
%changelog -n kdebase3
+* Tue Oct 24 2006 - dmueller@suse.de
+- update WM configuration patch
* Tue Oct 24 2006 - coolo@suse.de
- update kdm config patch
* Mon Oct 23 2006 - dmueller@suse.de
++++++ optional-kwin.diff ++++++
--- /var/tmp/diff_new_pack.DmCBYg/_old 2006-10-26 20:07:06.000000000 +0200
+++ /var/tmp/diff_new_pack.DmCBYg/_new 2006-10-26 20:07:06.000000000 +0200
@@ -1,8 +1,6 @@
-Index: ksmserver/startup.cpp
-===================================================================
---- ksmserver/startup.cpp (revision 598312)
-+++ ksmserver/startup.cpp (working copy)
-@@ -64,6 +64,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE
+--- ksmserver/startup.cpp
++++ ksmserver/startup.cpp
+@@ -64,6 +64,7 @@
#include
#include
#include
@@ -10,16 +8,17 @@
#include
#include
-@@ -85,6 +86,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE
+@@ -85,6 +86,9 @@
#include
+static bool compizEnabled();
++static bool compizDefault();
+
/*! Restores the previous session. Ensures the window manager is
running (if specified).
*/
-@@ -109,7 +112,7 @@ void KSMServer::restoreSession( QString
+@@ -109,7 +113,7 @@
for ( int i = 1; i <= count; i++ ) {
QString n = QString::number(i);
if ( wm == config->readEntry( QString("program")+n ) ) {
@@ -28,7 +27,7 @@
}
}
}
-@@ -137,6 +140,18 @@ void KSMServer::restoreSession( QString
+@@ -137,6 +141,18 @@
}
}
@@ -47,13 +46,17 @@
/*!
Starts the default session.
-@@ -157,10 +172,23 @@ void KSMServer::startDefaultSession()
+@@ -157,10 +173,27 @@
"autoStart1Done()", true);
connectDCOPSignal( launcher, launcher, "autoStart2Done()",
"autoStart2Done()", true);
- startApplication( wm );
+
-+ if (compizEnabled()) {
++ KConfig* config = KGlobal::config();
++ config->setGroup("General");
++ if (config->readEntry("defaultWM", compizDefault() ? "compiz" : "kwin") == "compiz"
++ && compizEnabled() )
++ {
+ launchCompiz();
+ }
+ else
@@ -72,7 +75,7 @@
void KSMServer::clientSetProgram( KSMClient* client )
{
-@@ -178,6 +206,31 @@ void KSMServer::autoStart0()
+@@ -178,6 +211,37 @@
DCOPRef( launcher ).send( "autoStart", (int) 0 );
}
@@ -85,6 +88,7 @@
+static bool compizEnabled()
+{
+ if (!qt_resolve_gl_symbols(false)) return false;
++ if (compizDefault()) return true;
+
+ QGLFormat f;
+ f.setDoubleBuffer(true);
@@ -101,14 +105,17 @@
+ return glxThere && compositeThere;
+}
+
++static bool compizDefault()
++{
++ return VendorRelease(qt_xdisplay()) == 70000001;
++}
++
void KSMServer::autoStart0Done()
{
if( state != AutoStart0 )
-Index: ksmserver/server.cpp
-===================================================================
---- ksmserver/server.cpp (revision 598312)
-+++ ksmserver/server.cpp (working copy)
-@@ -114,7 +114,7 @@ void KSMServer::startApplication( QStrin
+--- ksmserver/server.cpp
++++ ksmserver/server.cpp
+@@ -114,7 +114,7 @@
}
if ( !clientMachine.isEmpty() && clientMachine != "localhost" ) {
command.prepend( clientMachine );
@@ -117,7 +124,7 @@
}
int n = command.count();
QCString app = command[0].latin1();
-@@ -578,12 +578,14 @@ static Status KSMNewClientProc ( SmsConn
+@@ -578,12 +578,14 @@
extern "C" int _IceTransNoListen(const char * protocol);
#endif
@@ -133,11 +140,9 @@
shutdownType = KApplication::ShutdownTypeNone;
-Index: ksmserver/KSMServerInterface.h
-===================================================================
---- ksmserver/KSMServerInterface.h (revision 598312)
-+++ ksmserver/KSMServerInterface.h (working copy)
-@@ -17,6 +17,7 @@ k_dcop:
+--- ksmserver/KSMServerInterface.h
++++ ksmserver/KSMServerInterface.h
+@@ -17,6 +17,7 @@
virtual QString currentSession() = 0;
virtual void saveCurrentSession() = 0;
virtual void saveCurrentSessionAs( QString ) = 0;
@@ -145,11 +150,9 @@
virtual void autoStart2() = 0;
-Index: ksmserver/server.h
-===================================================================
---- ksmserver/server.h (revision 598312)
-+++ ksmserver/server.h (working copy)
-@@ -58,7 +58,7 @@ k_dcop:
+--- ksmserver/server.h
++++ ksmserver/server.h
+@@ -58,7 +58,7 @@
void kcmPhase1Done();
void kcmPhase2Done();
public:
@@ -158,7 +161,7 @@
~KSMServer();
static KSMServer* self();
-@@ -157,11 +157,14 @@ private:
+@@ -157,11 +157,14 @@
QString currentSession();
void saveCurrentSession();
void saveCurrentSessionAs( QString );
@@ -173,7 +176,7 @@
enum State
{
Idle,
-@@ -182,6 +185,7 @@ private:
+@@ -182,6 +185,7 @@
bool clean;
KSMClient* clientInteracting;
QString wm;
@@ -181,11 +184,9 @@
QString sessionGroup;
QString sessionName;
QCString launcher;
-Index: ksmserver/main.cpp
-===================================================================
---- ksmserver/main.cpp (revision 598312)
-+++ ksmserver/main.cpp (working copy)
-@@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int a
+--- ksmserver/main.cpp
++++ ksmserver/main.cpp
+@@ -218,7 +218,7 @@
only_local = false;
#endif
@@ -194,10 +195,8 @@
kapp->dcopClient()->setDefaultObject( server->objId() );
IceSetIOErrorHandler( IoErrorHandler );
-Index: kcontrol/smserver/smserverconfigdlg.ui
-===================================================================
---- kcontrol/smserver/smserverconfigdlg.ui (revision 598312)
-+++ kcontrol/smserver/smserverconfigdlg.ui (working copy)
+--- kcontrol/smserver/smserverconfigdlg.ui
++++ kcontrol/smserver/smserverconfigdlg.ui
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
@@ -297,31 +296,36 @@
</size>
</property>
</spacer>
-@@ -201,14 +226,8 @@
+@@ -201,38 +226,32 @@
</widget>
<connections>
<connection>
- <sender>confirmLogoutCheck</sender>
- <signal>toggled(bool)</signal>
-- <receiver>SMServerConfigDlg</receiver>
-- <slot>configChanged()</slot>
-- </connection>
-- <connection>
-- <sender>loginGroup</sender>
-- <signal>clicked(int)</signal>
+ <sender>excludeLineedit</sender>
+ <signal>textChanged(const QString&)</signal>
<receiver>SMServerConfigDlg</receiver>
<slot>configChanged()</slot>
</connection>
-@@ -219,19 +238,13 @@
+ <connection>
+- <sender>loginGroup</sender>
++ <sender>sdGroup</sender>
+ <signal>clicked(int)</signal>
+ <receiver>SMServerConfigDlg</receiver>
+ <slot>configChanged()</slot>
+ </connection>
+ <connection>
+- <sender>sdGroup</sender>
++ <sender>loginGroup</sender>
+ <signal>clicked(int)</signal>
+ <receiver>SMServerConfigDlg</receiver>
<slot>configChanged()</slot>
</connection>
<connection>
- <sender>excludeLineedit</sender>
- <signal>textChanged(const QString&)</signal>
-+ <sender>loginGroup</sender>
-+ <signal>clicked(int)</signal>
++ <sender>confirmLogoutCheck</sender>
++ <signal>toggled(bool)</signal>
<receiver>SMServerConfigDlg</receiver>
<slot>configChanged()</slot>
</connection>
@@ -333,14 +337,14 @@
- </connection>
- <connection>
- <sender>offerShutdownCheck</sender>
-+ <sender>confirmLogoutCheck</sender>
- <signal>toggled(bool)</signal>
+- <signal>toggled(bool)</signal>
++ <sender>preferredWMCombo</sender>
++ <signal>activated(const QString&)</signal>
<receiver>SMServerConfigDlg</receiver>
<slot>configChanged()</slot>
-Index: kcontrol/smserver/kcmsmserver.cpp
-===================================================================
---- kcontrol/smserver/kcmsmserver.cpp (revision 598312)
-+++ kcontrol/smserver/kcmsmserver.cpp (working copy)
+ </connection>
+--- kcontrol/smserver/kcmsmserver.cpp
++++ kcontrol/smserver/kcmsmserver.cpp
@@ -22,12 +22,15 @@
#include
#include
@@ -357,7 +361,7 @@
#include
#include "kcmsmserver.h"
-@@ -61,6 +64,50 @@ void SMServerConfig::load()
+@@ -61,6 +64,56 @@
load( false );
}
@@ -377,9 +381,15 @@
+ void* getVi() const { return vi; }
+};
+
++static bool compizDefault()
++{
++ return VendorRelease(qt_xdisplay()) == 70000001;
++}
++
+static bool compizEnabled()
+{
+ if (!qt_resolve_gl_symbols(false)) return false;
++ if (compizDefault()) return true;
+
+ QGLFormat f;
+ f.setDoubleBuffer(true);
@@ -408,7 +418,7 @@
void SMServerConfig::load(bool useDefaults )
{
KConfig *c = new KConfig("ksmserverrc", false, false);
-@@ -91,6 +138,16 @@ void SMServerConfig::load(bool useDefaul
+@@ -91,6 +144,17 @@
break;
}
dialog->excludeLineedit->setText( c->readEntry("excludeApps"));
@@ -420,17 +430,18 @@
+
+ dialog->preferredWMCombo->setEnabled(dialog->preferredWMCombo->count() > 1);
+
-+ if (c->readEntry("defaultWM", "kwin") != "kwin" && dialog->preferredWMCombo->count() > 1)
++ if (c->readEntry("defaultWM", compizDefault() ? "compiz" : "kwin") != "kwin"
++ && dialog->preferredWMCombo->count() > 1)
+ dialog->preferredWMCombo->setCurrentItem(1);
delete c;
-@@ -117,6 +174,14 @@ void SMServerConfig::save()
+@@ -117,6 +181,14 @@
int(KApplication::ShutdownTypeReboot) :
int(KApplication::ShutdownTypeNone));
c->writeEntry("excludeApps", dialog->excludeLineedit->text());
+
-+ if (c->readEntry("defaultWM", "kwin") != dialog->preferredWMCombo->currentText())
++ if (c->readEntry("defaultWM", compizDefault() ? "compiz": "kwin") != dialog->preferredWMCombo->currentText())
+ {
+ DCOPRef dcop("ksmserver", "ksmserver");
+ dcop.send("switchWindowManager(QString)", dialog->preferredWMCombo->currentText());
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org