Move krootbacking executable from kdeartwork to kdebase

Reenable HAL media manager
Fix system tray with ARGB visuals (again)
Beautify logout process


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1249834 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 2 deletions

diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index 5beb32ca4..e6bcfdab2 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -81,6 +81,7 @@ class KSMShutdownIPFeedback : public TQWidget
 
 public:
     static void start() { s_pSelf = new KSMShutdownIPFeedback(); }
+    static void showit() { if ( s_pSelf != 0L ) s_pSelf->showNow(); }
     static void stop() { if ( s_pSelf != 0L ) s_pSelf->fadeBack(); delete s_pSelf; s_pSelf = 0L; }
     static KSMShutdownIPFeedback * self() { return s_pSelf; }
 
@@ -89,7 +90,6 @@ protected:
 
 private slots:
     void slotPaintEffect();
-    void slotDone(bool success);
 
 private:
     static KSMShutdownIPFeedback * s_pSelf;
@@ -97,8 +97,8 @@ private:
     int m_currentY;
     TQPixmap m_root;
     void fadeBack( void );
+    void showNow( void );
     TQString pixmapName(int desk);
-    KSharedPixmap* m_sharedpixmap;
     void enableExports();
     int m_timeout;
 };
@@ -144,6 +144,9 @@ public:
 protected:
     ~KSMShutdownIPDlg();
 
+protected slots:
+    void closeEvent(TQCloseEvent *e);
+
 private:
     KSMShutdownIPDlg( TQWidget* parent );
 };