diff options
| author | Timothy Pearson <[email protected]> | 2012-05-16 21:56:11 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-05-16 21:56:11 -0500 |
| commit | d2f8fca98e6d276f442f90dee48164be15d8e287 (patch) | |
| tree | b7315de120d566bcd002ce4330381801f814812b /ksmserver/shutdowndlg.cpp | |
| parent | d41f52171966007990bd9176cde217a8ba0f335a (diff) | |
| download | tdebase-d2f8fca98e6d276f442f90dee48164be15d8e287.tar.gz tdebase-d2f8fca98e6d276f442f90dee48164be15d8e287.zip | |
Fix fancy logout not allowing interaction with save dialogs
This closes Bug 922
Fix desktop wallpaper export failing when triggered by krootbacking or ksmserver and konsole or kdesktop_lock not previously loaded
Diffstat (limited to 'ksmserver/shutdowndlg.cpp')
| -rw-r--r-- | ksmserver/shutdowndlg.cpp | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 163352acf..35cae6537 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -528,6 +528,11 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback() : TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0) { + setShown(false); + hide(); + + enableExports(); + m_sharedRootPixmap = new KRootPixmap(this); m_sharedRootPixmap->setCustomPainting(true); connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &))); @@ -554,15 +559,36 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback() setBackgroundPixmap( m_root ); setGeometry( TQApplication::desktop()->geometry() ); setBackgroundMode( TQWidget::NoBackground ); - - setShown(true); } void KSMShutdownIPFeedback::showNow() { + setShown(true); + TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) ); } +void KSMShutdownIPFeedback::enableExports() +{ +#ifdef Q_WS_X11 + kdDebug(270) << k_lineinfo << "activating background exports.\n"; + DCOPClient *client = kapp->dcopClient(); + if (!client->isAttached()) { + client->attach(); + } + TQByteArray data; + TQDataStream args( data, IO_WriteOnly ); + args << 1; + + TQCString appname( "kdesktop" ); + int screen_number = DefaultScreen(tqt_xdisplay()); + if ( screen_number ) + appname.sprintf("kdesktop-screen-%d", screen_number ); + + client->send( appname, "KBackgroundIface", "setExport(int)", data ); +#endif +} + KSMShutdownIPFeedback::~KSMShutdownIPFeedback() { if (m_sharedRootPixmap) { |