From 4a8fa10ad1ff2ac4fc649e3c22ac7b3cc100fd96 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 15 Aug 2011 01:49:45 +0000 Subject: 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 --- kdm/kfrontend/kgapp.cpp | 4 ++-- kdm/kfrontend/kgapp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 677b5ec2a..e83b61718 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -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; if (pingInterval) { @@ -212,7 +212,7 @@ kg_main( const char *argv0 ) GreeterApp *app; if ( (argb_visual_available == true) && (!_compositor.isEmpty()) ) { - app = new GreeterApp(dpyi); + app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap )); } else { app = new GreeterApp(); diff --git a/kdm/kfrontend/kgapp.h b/kdm/kfrontend/kgapp.h index 38c73d3c1..2c4374f47 100644 --- a/kdm/kfrontend/kgapp.h +++ b/kdm/kfrontend/kgapp.h @@ -34,7 +34,7 @@ class GreeterApp : public KApplication { public: GreeterApp(); - GreeterApp(Display *dpy); + GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap); virtual bool x11EventFilter( XEvent * ); protected: -- cgit v1.2.1