[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    aegypten_branch: kdepim/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-05-29 16:15:13
Message-ID: 20040529161513.C8898126D6 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Merge from HEAD: CVS commit by thorsen: 

As noted in the kmcommands comment, this can't work. So don't try at all. Remving the \
messageQueuedOrDrafted signal


  M +0 -5      kmcommands.cpp   1.87.2.16
  M +0 -4      kmcomposewin.cpp   1.765.2.42
  M +0 -5      kmcomposewin.h   1.224.2.18


--- kdepim/kmail/kmcommands.cpp  #1.87.2.15:1.87.2.16
@@ -529,9 +529,4 @@ void KMEditMsgCommand::execute()
 
   KMComposeWin *win = new KMComposeWin();
-#if 0
-  // FIXME: Poor solution, won't work for multiple readerwins should use kmkernel as \
                an observer
-  QObject::connect( win, SIGNAL( messageQueuedOrDrafted()),
-                    this, SLOT( slotMessageQueuedOrDrafted()) );
-#endif
   msg->setTransferInProgress(false); // From here on on, the composer owns the \
message.  win->setMsg(msg, FALSE, TRUE);

--- kdepim/kmail/kmcomposewin.cpp  #1.765.2.41:1.765.2.42
@@ -326,5 +326,4 @@ KMComposeWin::~KMComposeWin()
     mAutoDeleteMsg = FALSE;
     mFolder->addMsg(mMsg);
-    emit messageQueuedOrDrafted();
   }
   if (mAutoDeleteMsg) {
@@ -2993,7 +2992,4 @@ void KMComposeWin::slotContinueDoSend( b
   }
 
-  if (mSaveInDrafts || !mSendNow)
-      emit messageQueuedOrDrafted();
-
   RecentAddresses::self(KMKernel::config())->add( bcc() );
   RecentAddresses::self(KMKernel::config())->add( cc() );

--- kdepim/kmail/kmcomposewin.h  #1.224.2.17:1.224.2.18
@@ -562,9 +562,4 @@ public:
 
 signals:
-  /**
-   * A message has been queued or saved in the drafts folder
-   */
-  void messageQueuedOrDrafted();
-
   void applyChangesDone( bool );
 


[prev in list] [next in list] [prev in thread] [next in thread]