[Kroupware] Re: Problem building kdepim-kroupware-RC4

[Bo Thorsen]

On Monday 07 July 2003 17:12, Tobias Koenig wrote:
> On Mon, Jul 07, 2003 at 11:58:17AM +0200, Bo Thorson wrote:
> > On Monday 07 July 2003 11:44, Martin Konold wrote:
> > > Am Montag, 7. Juli 2003 11:13 schrieb Laurent Rathle:
>
> Hi Bo,
>
> > > The Kroupware branch is incompatible to CVS HEAD.
> >
> > I hope that is wrong - KDE cvs HEAD must be both source and binary
> > compatible to 3.1 branch. kdelibs and kdebase from HEAD should be
> > fine (although potentially unstable).
>
> No, that's correct. It seems we introduced the class
> KABC::ResourceSeledtDialog short before kroupware branch was splitted
> from HEAD and removed it after splitting, so this class exists neither
> in 3_1_BRANCH nor in HEAD.

What do you mean? The diff between kroupware_branch kaddressbook.cpp and 
KDE_3_1_BRANCH is only this:

bo at shrek> diff -u kdepim/kaddressbook/kaddressbook.cpp
--- kdepim/kaddressbook/kaddressbook.cpp        2003-02-27 
21:10:24.000000000 +0100
+++ ../kdepim/kaddressbook/kaddressbook.cpp     2003-03-13 
13:48:09.000000000 +0100
@@ -498,6 +498,29 @@
   return ownerName;
 }

+ASYNC KAddressBook::addVCard( QString vCard )
+{
+  KABC::VCardConverter converter;
+  KABC::Addressee a;
+  bool ok = false;
+
+  if ( vCard.contains( "VERSION:3.0" ) )
+    ok = converter.vCardToAddressee( vCard, a, KABC::VCardConverter::v3_0 
);
+  else if ( vCard.contains( "VERSION:2.1" ) )
+    ok = converter.vCardToAddressee( vCard, a, KABC::VCardConverter::v2_1 
);
+
+  if ( !a.isEmpty() && ok ) {
+    // Add it to the document, then let the user edit it. We use a
+    // PwNewCommand so the user can undo it.
+    PwNewCommand *command = new PwNewCommand(mDocument, a);
+    UndoStack::instance()->push(command);
+    RedoStack::instance()->clear();
+
+    mViewManager->refresh();
+    emit modified( true );
+  }
+}
+
 void KAddressBook::addresseeSelected(const QString &uid)
 {
     emit addresseeSelected(uid != QString::null);

And I found this in kdelibs/kabc/Makefile.am (KDE_3_1_BRANCH):

kabcinclude_HEADERS = ... resourceselectdialog.h 

As you can see, the use of kabc/resourceselectdialog.h is in 3.1 branch of 
kaddressbook too. If this was removed from kdelibs HEAD, it's a source 
compatibility regression over 3.1 and we must fix it in kdelibs.

Bo.

-- 

     Bo Thorsen                 |   Praestevejen 4
     Senior Software Engineer   |   5290 Marslev
     Klarälvdalens Datakonsult  |   Denmark