summaryrefslogtreecommitdiffstats
path: root/kresources
diff options
context:
space:
mode:
Diffstat (limited to 'kresources')
-rw-r--r--kresources/lib/Makefile.am10
-rw-r--r--kresources/remote/resourceremote.cpp20
2 files changed, 20 insertions, 10 deletions
diff --git a/kresources/lib/Makefile.am b/kresources/lib/Makefile.am
index 0b3f29b6e..0a4d3e37b 100644
--- a/kresources/lib/Makefile.am
+++ b/kresources/lib/Makefile.am
@@ -1,7 +1,4 @@
-INCLUDES = -I$(top_srcdir) \
--I$(top_srcdir)/libkcal/libical/src/libical -I$(top_srcdir)/libkcal/libical/src/libicalss \
- -I$(top_builddir)/libkcal/libical/src/libical -I$(top_builddir)/libkcal/libical/src/libicalss \
- $(all_includes)
+INCLUDES = -I$(top_srcdir) $(all_includes)
lib_LTLIBRARIES = libkgroupwarebase.la libkgroupwaredav.la
@@ -24,11 +21,11 @@ libkgroupwaredav_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
METASOURCES = AUTO
-### We use three (or more) namespaces here in here - KPIM, KABC and KCal.
+### We use three (or more) namespaces here in here - KPIM, KABC and KCal.
### When using multiple "using namespace foo" declarations, namespaced
### definitions cannot be resolved properly; we could use namespace foo { }
### instead, but this breaks on KConfigXT generated code, which still uses
-### "using namespace" and can't be fixed due to our backwards-compatibility
+### "using namespace" and can't be fixed due to our backwards-compatibility
### requirements. This is only fatal when doing --enable-final, since only
### then do all the namespaces get mixed together.
KDE_OPTIONS = nofinal
@@ -36,4 +33,3 @@ KDE_OPTIONS = nofinal
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kdepimresources.pot
-webdavhandler.lo: ../../libkcal/libical/src/libical/ical.h
diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp
index 3c9db7695..68d484c01 100644
--- a/kresources/remote/resourceremote.cpp
+++ b/kresources/remote/resourceremote.cpp
@@ -30,6 +30,7 @@
#include <kurl.h>
#include <kio/job.h>
#include <klocale.h>
+#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <libkcal/icalformat.h>
@@ -220,7 +221,20 @@ void ResourceRemote::slotPercent( KIO::Job *, unsigned long percent )
void ResourceRemote::slotLoadJobResult( KIO::Job *job )
{
if ( job->error() ) {
- job->showErrorDialog( 0 );
+ // TODO: Should detect 404, 401 etc. vs host not found and prompt to create new resource only when 404 is returned
+ QString warningString = QString("<b>") + i18n("Remote data access failure") + QString("</b><p>") + i18n("Detailed information") \
+ + QString(":<br>") + job->errorString() + QString("<p>") + i18n("What would you like to do?");
+ int rc = KMessageBox::warningContinueCancel(0,
+ warningString, i18n("Remote Data Access Failure"), i18n("&Continue with cached resource"));
+ if ( rc == KMessageBox::Continue ) {
+ mCalendar.close();
+ disableChangeNotification();
+ loadCache();
+ enableChangeNotification();
+
+ emit resourceChanged( this );
+ }
+ //job->showErrorDialog( 0 );
} else {
kdDebug(5800) << "ResourceRemote::slotLoadJobResult() success" << endl;
@@ -284,7 +298,7 @@ void ResourceRemote::slotSaveJobResult( KIO::Job *job )
job->showErrorDialog( 0 );
} else {
kdDebug(5800) << "ResourceRemote::slotSaveJobResult() success" << endl;
-
+
Incidence::List::ConstIterator it;
for( it = mChangedIncidences.begin(); it != mChangedIncidences.end();
++it ) {
@@ -292,7 +306,7 @@ void ResourceRemote::slotSaveJobResult( KIO::Job *job )
}
mChangedIncidences.clear();
}
-
+
mUploadJob = 0;
emit resourceSaved( this );