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

List:       kde-commits
Subject:    kdepim/kaddressbook
From:       Karl-Heinz Zimmer <khz () klaralvdalens-datakonsult ! se>
Date:       2004-06-15 10:07:29
Message-ID: 20040615100729.C7B09126E4 () office ! kde ! org
[Download RAW message or body]

CVS commit by khz: 

Revert parts of my previous patch to make sure that KAddressbook's old and nice KMail \
independency is there again.  (at least as long as no IMAP server is used by \
KAddressbook)


  M +1 -4      Makefile.am   1.140
  M +5 -5      kabcore.cpp   1.102


--- kdepim/kaddressbook/Makefile.am  #1.139:1.140
@@ -30,5 +30,5 @@
 
 lib_LTLIBRARIES = libkaddressbook.la
-libkaddressbook_la_SOURCES = addresseeconfig.cpp kmailIface.stub \
addresseeeditordialog.cpp \ +libkaddressbook_la_SOURCES = addresseeconfig.cpp \
addresseeeditordialog.cpp \  addresseeeditorwidget.cpp addresseeutil.cpp \
addresseditwidget.cpp \  addviewdialog.cpp emaileditwidget.cpp extensionmanager.cpp \
@@ -65,7 +65,4 @@
     xxportselectdialog.h advancedcustomfields.h
 
-kmailIface_DIR = $(top_srcdir)/kmail
-kmailIface_DCOPIDLNG = true
-
 kaddressbook_METASOURCES = AUTO
 

--- kdepim/kaddressbook/kabcore.cpp  #1.101:1.102
@@ -40,5 +40,4 @@
 #include <kapplication.h>
 #include <dcopclient.h>
-#include "kmailIface_stub.h"
 #include <kactionclasses.h>
 #include <kcmdlineargs.h>
@@ -388,8 +387,9 @@ void KABCore::mailVCard( const QStringLi
     }
   }
-  KMailIface_stub kmailIface( "kmail", "KMailIface" );
-  kmailIface.openComposer( QString::null, QString::null, QString::null,
-                           QString::null, QString::null, 0, KURL(),
-                           urls );
+  kapp->invokeMailer( QString::null, QString::null, QString::null,
+                      QString::null,  // subject
+                      QString::null,  // body
+                      QString::null,
+                      urls.toStringList() );  // attachments
 }
 


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