summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-07-07 12:55:35 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-07-07 12:55:35 -0500
commita430ade7c32570f39426f2fcd5e2ece849c24a51 (patch)
tree074999dd775a3626c2ab6e498828a2ece80820d3
parentd269ebfb71df16274e2d6d58c55709b8c2cfc535 (diff)
parent27f6b882c6ab3d87b3495e5b8d149670295fb5c9 (diff)
downloadtdepim-a430ade7c32570f39426f2fcd5e2ece849c24a51.tar.gz
tdepim-a430ade7c32570f39426f2fcd5e2ece849c24a51.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim
-rw-r--r--kmail/kmfoldercachedimap.cpp2
-rw-r--r--kmail/mailcomposerIface.h3
-rw-r--r--knotes/knote.cpp2
3 files changed, 5 insertions, 2 deletions
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 72f1113c2..e7009a237 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/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;
diff --git a/kmail/mailcomposerIface.h b/kmail/mailcomposerIface.h
index 130a99e1f..189a573d4 100644
--- a/kmail/mailcomposerIface.h
+++ b/kmail/mailcomposerIface.h
@@ -13,6 +13,9 @@
class MailComposerIface : virtual public DCOPObject
{
K_DCOP
+
+ public: MailComposerIface() : DCOPObject("MailComposerIface") {}
+
k_dcop:
/**
Send message.
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index e68c8ca29..4b0a9172c 100644
--- a/knotes/knote.cpp
+++ b/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()
);