Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim

kmail/kmfoldercachedimap.cpp

@@ -478,7 +478,7 @@ int KMFolderCachedImap::writeUidCache()
     str << lastUid() << endl;
     uidcache.flush();
     if ( uidcache.status() == IO_Ok ) {
-      fsync( uidcache.handle() ); /* this is probably overkill */
+      // fsync( uidcache.handle() ); /* this is probably overkill */
       uidcache.close();
       if ( uidcache.status() == IO_Ok )
         return 0;

kmail/mailcomposerIface.h

@@ -13,6 +13,9 @@
 class MailComposerIface : virtual public DCOPObject
 {
     K_DCOP
+
+    public: MailComposerIface() : DCOPObject("MailComposerIface") {}
+
   k_dcop:
     /**
       Send message.      

knotes/knote.cpp

@@ -1214,7 +1214,7 @@ void KNote::updateLayout()
     if( m_tool ) {
       m_tool->setGeometry(
           contentsRect().x(),
-          contentsRect().bottom() - m_tool->height() + 1,
+          contentsRect().bottom() - (m_tool->isHidden() ? 0 : m_tool->height()) + 1,
           contentsRect().width(),
           m_tool->height()
       );