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

List:       kmail-devel
Subject:    [PATCH] fix calls to deprecated methods of KABC::Addressbook
From:       Andreas Gungl <a.gungl () gmx ! de>
Date:       2003-12-30 22:25:34
Message-ID: 200312302325.45044 () gungl-dd ! de
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I've tested the changes and didn't find any side effects. Please review.

Andreas
- -- 
    ~
  ' v '
 //   \\
/(     )\  Powered by Penguin.
  ^ ' ^

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2-rc1-SuSE (GNU/Linux)

iD8DBQE/8ftmVhjiFd4beU8RAo11AJ9wjmBSmmtTipx+usI2jc/QggUJgQCg0eha
7/p6EHxJ/BLBvrMUOU4n0Ac=
=x8Yl
-----END PGP SIGNATURE-----

["kmaddrbook.cpp.diff" (text/x-diff)]

Index: kmaddrbook.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/kmaddrbook.cpp,v
retrieving revision 1.80
diff -u -3 -p -r1.80 kmaddrbook.cpp
--- kmaddrbook.cpp	12 Dec 2003 13:39:08 -0000	1.80
+++ kmaddrbook.cpp	30 Dec 2003 22:17:38 -0000
@@ -171,9 +171,10 @@ void KMAddrBookExternal::addEmail( const
     a.setNameFromString( name );
     a.insertEmail( email, true );
 
-    ab->insertAddressee(a);
-
-    if ( !KABC::StdAddressBook::save() ) {
+    KABC::Ticket *t = ab->requestSaveTicket();
+    if ( t )
+      ab->insertAddressee(a);
+    if ( !t || !ab->save( t ) ) {
       KMessageBox::error( parent, i18n("Can't save to addressbook.") );
     } else {
       QString text = i18n("<qt>The email address <b>%1</b> was added to your "
@@ -235,8 +236,10 @@ bool KMAddrBookExternal::addVCard( const
       ab->findByEmail( addressee.preferredEmail() );
 
   if ( addressees.isEmpty() ) {
-    ab->insertAddressee( addressee );
-    if ( !KABC::StdAddressBook::save() ) {
+    KABC::Ticket *t = ab->requestSaveTicket();
+    if ( t )
+      ab->insertAddressee( addressee );
+    if ( !t || !ab->save( t ) ) {
       KMessageBox::error( parent, i18n("Can't save to addressbook.") );
       inserted = false;
     } else {


_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel


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