[Kroupware] Partial merge of kroupware into HEAD

[Marc Mutz]

--Boundary-03=_GhU59sehOPC/RQT
Content-Type: multipart/mixed;
  boundary="Boundary-01=_FhU59esrppxhOGu"
Content-Transfer-Encoding: 7bit
Content-Description: signed data
Content-Disposition: inline

--Boundary-01=_FhU59esrppxhOGu
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Description: body text
Content-Disposition: inline

Hi!

Since HEAD CVS is open for 3.2 development again, I've comitted some of 
the kdenetwork stuff that was developed in kroupware_branch to HEAD. 
Specifically, this is:

1. RFC-compliant MDN support
2. Rudimentary support for vacation through Sieve.
3. A ManageSieve KIO::Slave
4. KTNEF, a lib and gui to read and view MSTNEF/MAPI objects.

Thus, the branching in the following subdirs of kdenetwork has been 
killed:
- libkdenetwork
- kioslaves
- ktnef
Equivalently, you could say that only the kmail subdir stays branched 
for now.

If you worked on the kroupware_branch from CVS, you can apply these 
commands to update:
cd kdenetwork/libkdenetwork
cvs up -A .
cd ../ktnef
cvs up -A .
cd ../kioslaves
cvs up -A .

Tomorrow, I will port the KMAccount hierarchy refactoring I've done so 
far to HEAD and then hope that KDAB will have disconnected IMAP ready 
for porting ASAP. I don't want to keep merging stuff against a devel 
version. :-(

Also tomorrow, I will likely merge kroupware's KAddressBook into HEAD. 
Changes are:
1. new subdir resourceimap
2. some apparent bugfixes in the other code.
I'd like to hear from kdepim people about (2) and about the merge of 
kaddressbook in general. Specifically, I need permission from someone 
to merge. The attached patch contains all changes made in the 
kroupware_branch outside of the new subdir. [Please CC me]

That means, that the stuff that's left in kroupware_branch in kdenetwork 
is what's controversial and in kdepim what's not understood yet by me 
or also controversial.

We plan to port kroupware_branch to use Kaplan, but we are not sure that 
we will get a stable version this way in time for the contract to be 
fulfilled successfully.

Thus, we plan to open a new branch port_kroupware_to_kaplan (or so) and 
do the port there using the make_it_cool code, so we can keep 
kroupware_branch for bugfixing and as possible end product to be 
shipped to the BSI in the likely case that we don't get 
kroupware/kaplan stable in time.

In any case, kroupware/kaplan will be what ends up in HEAD.

Marc

-- 
It's good fortune for the government that the masses don't think.
                                                         -- Adolf Hitler

--Boundary-01=_FhU59esrppxhOGu
Content-Type: text/x-diff;
  charset="us-ascii";
  name="kaddressbook-HEAD-2-kroupware.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline; filename="kaddressbook-HEAD-2-kroupware.diff"

diff -urN -x CVS -x Makefile -x Makefile.in -x resourceimap -x .#* kdepim/k=
addressbook/Makefile.am kdepim-kroupware/kaddressbook/Makefile.am
=2D-- kdepim/kaddressbook/Makefile.am	Sat Nov 23 12:54:36 2002
+++ kdepim-kroupware/kaddressbook/Makefile.am	Sat Nov 23 14:34:30 2002
@@ -3,7 +3,7 @@
 	-I$(top_srcdir) -I$(top_builddir)/kaddressbook/printing \
 	-I$(top_builddir)/kaddressbook/details $(all_includes)=20
=20
=2DSUBDIRS =3D details features printing views . pics csv-templates
+SUBDIRS =3D details features printing views . pics csv-templates resourcei=
map
=20
 SRCDOC_DEST=3D$(kde_htmldir)/en/kaddressbook
=20
diff -urN -x CVS -x Makefile -x Makefile.in -x resourceimap -x .#* kdepim/k=
addressbook/kaddressbook.cpp kdepim-kroupware/kaddressbook/kaddressbook.cpp
=2D-- kdepim/kaddressbook/kaddressbook.cpp	Sat Nov 23 12:54:36 2002
+++ kdepim-kroupware/kaddressbook/kaddressbook.cpp	Sat Nov 23 14:34:30 2002
@@ -211,7 +211,7 @@
   mEditorDict.remove( uid );
 }
=20
=2Dvoid KAddressBook::save()
+bool KAddressBook::save()
 {
   KABC::StdAddressBook *b =3D dynamic_cast<KABC::StdAddressBook*>(mDocumen=
t);
   if (!b || !b->save())
@@ -221,9 +221,11 @@
     			"not using it. ");
=20
     KMessageBox::error(this, text, i18n("Unable to Save"));
+    return false;
   }
=20
   emit modified(false);
+  return true;
 }
=20
 void KAddressBook::readConfig()
@@ -531,14 +533,22 @@
 {
   if( !mLdapSearchDialog ) {
     mLdapSearchDialog =3D new LDAPSearchDialogImpl( mDocument, this);
=2D    connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManage=
r,
=2D            SLOT( refresh() ) );
+    connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ),
+	     this, SLOT( slotLDAPRefresh() ) );
   } else
     mLdapSearchDialog->rereadConfig();
=20
   if( mLdapSearchDialog->isOK() )
     mLdapSearchDialog->exec();
 }
+
+// This slot is used by the LDAP dialog to make sure we refresh the view
+void KAddressBook::slotLDAPRefresh()
+{
+  emit modified(true);
+  mViewManager->refresh();
+}
+
=20
 void KAddressBook::print()
 {
diff -urN -x CVS -x Makefile -x Makefile.in -x resourceimap -x .#* kdepim/k=
addressbook/kaddressbook.h kdepim-kroupware/kaddressbook/kaddressbook.h
=2D-- kdepim/kaddressbook/kaddressbook.h	Sat Nov 23 12:54:36 2002
+++ kdepim-kroupware/kaddressbook/kaddressbook.h	Sat Nov 23 14:34:30 2002
@@ -58,7 +58,7 @@
=20
     /** Saves the contents of the AddressBook back to disk.
     */
=2D    void save();
+    bool save();
=20
     /** Reads the config file.
     */
@@ -158,6 +158,7 @@
     void viewModified();
=20
     void slotOpenLDAPDialog();
+    void slotLDAPRefresh();
=20
     /** Called whenever the configuration is changed. This happens when
     * the user presses the OK or Apply button in the PrefsDialog.

--Boundary-01=_FhU59esrppxhOGu--

--Boundary-03=_GhU59sehOPC/RQT
Content-Type: application/pgp-signature
Content-Description: signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQA95UhF3oWD+L2/6DgRAgi7AKC7WA5yz8o47Bs93LpQjqh1QzaeWgCgyfa0
nT3EYb/5I0OzHpcH1okQziM=
=QFdN
-----END PGP SIGNATURE-----

--Boundary-03=_GhU59sehOPC/RQT--