[prev in list] [next in list] [prev in thread] [next in thread]
List: kmail-devel
Subject: Partial merge of kroupware into HEAD
From: Marc Mutz <mutz () kde ! org>
Date: 2002-11-27 22:33:41
[Download RAW message or body]
[Attachment #2 (multipart/mixed)]
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
["kaddressbook-HEAD-2-kroupware.diff" (text/x-diff)]
diff -urN -x CVS -x Makefile -x Makefile.in -x resourceimap -x .#* \
kdepim/kaddressbook/Makefile.am \
kdepim-kroupware/kaddressbook/Makefile.am
--- 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)
-SUBDIRS = details features printing views . pics csv-templates
+SUBDIRS = details features printing views . pics csv-templates resourceimap
SRCDOC_DEST=$(kde_htmldir)/en/kaddressbook
diff -urN -x CVS -x Makefile -x Makefile.in -x resourceimap -x .#* \
kdepim/kaddressbook/kaddressbook.cpp \
kdepim-kroupware/kaddressbook/kaddressbook.cpp
--- 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 );
}
-void KAddressBook::save()
+bool KAddressBook::save()
{
KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>(mDocument);
if (!b || !b->save())
@@ -221,9 +221,11 @@
"not using it. ");
KMessageBox::error(this, text, i18n("Unable to Save"));
+ return false;
}
emit modified(false);
+ return true;
}
void KAddressBook::readConfig()
@@ -531,14 +533,22 @@
{
if( !mLdapSearchDialog ) {
mLdapSearchDialog = new LDAPSearchDialogImpl( mDocument, this);
- connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager,
- SLOT( refresh() ) );
+ connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ),
+ this, SLOT( slotLDAPRefresh() ) );
} else
mLdapSearchDialog->rereadConfig();
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();
+}
+
void KAddressBook::print()
{
diff -urN -x CVS -x Makefile -x Makefile.in -x resourceimap -x .#* \
kdepim/kaddressbook/kaddressbook.h \
kdepim-kroupware/kaddressbook/kaddressbook.h
--- 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 @@
/** Saves the contents of the AddressBook back to disk.
*/
- void save();
+ bool save();
/** Reads the config file.
*/
@@ -158,6 +158,7 @@
void viewModified();
void slotOpenLDAPDialog();
+ void slotLDAPRefresh();
/** Called whenever the configuration is changed. This happens when
* the user presses the OK or Apply button in the PrefsDialog.
[Attachment #6 (application/pgp-signature)]
_______________________________________________
KMail Developers mailing list
kmail@mail.kde.org
http://mail.kde.org/mailman/listinfo/kmail
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic