diff --git a/bridge.cpp b/bridge.cpp
index 6ac1a16e2c..3ea8a8a48f 100644
--- a/bridge.cpp
+++ b/bridge.cpp
@@ -69,10 +69,9 @@ NET::WindowType Bridge::windowType( unsigned long supported_types ) const
 
 QIcon Bridge::icon() const
     {
-#ifdef __GNUC__
-#warning KDE4 drop me ?
-#endif	    
-    return QIcon( /*c->miniIcon(),*/ c->icon());
+    QIcon ret( c->icon());
+    ret.addPixmap( c->miniIcon());
+    return ret;
     }
 
 bool Bridge::isSetShade() const
diff --git a/main.cpp b/main.cpp
index f72fd7b7d7..c32512ca9b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -382,10 +382,6 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
         signal(SIGINT, SIG_IGN);
     if (signal(SIGHUP, KWin::sighandler) == SIG_IGN)
         signal(SIGHUP, SIG_IGN);
-#ifdef __GNUC__
-#warning D-BUS TODO
-//    KApplication::disableAutoDcopRegistration();
-#endif
     KWin::Application a;
     KWin::SessionManager weAreIndeed;
     KWin::SessionSaveDoneHelper helper;