Make kdm non-reliant on the KApplication composition manager detection routine

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1247205 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 3809a25a5d
commit 4a8fa10ad1

@ -93,7 +93,7 @@ GreeterApp::GreeterApp()
} }
} }
GreeterApp::GreeterApp(Display *dpy) : KApplication(dpy) GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : KApplication(dpy, visual, colormap)
{ {
pingInterval = _isLocal ? 0 : _pingInterval; pingInterval = _isLocal ? 0 : _pingInterval;
if (pingInterval) { if (pingInterval) {
@ -212,7 +212,7 @@ kg_main( const char *argv0 )
GreeterApp *app; GreeterApp *app;
if ( (argb_visual_available == true) && (!_compositor.isEmpty()) ) { if ( (argb_visual_available == true) && (!_compositor.isEmpty()) ) {
app = new GreeterApp(dpyi); app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap ));
} }
else { else {
app = new GreeterApp(); app = new GreeterApp();

@ -34,7 +34,7 @@ class GreeterApp : public KApplication {
public: public:
GreeterApp(); GreeterApp();
GreeterApp(Display *dpy); GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap);
virtual bool x11EventFilter( XEvent * ); virtual bool x11EventFilter( XEvent * );
protected: protected:

Loading…
Cancel
Save