summaryrefslogtreecommitdiffstats
path: root/kresources
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-24 21:12:08 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-24 21:12:08 +0000
commitf8fb0a6b61511cee7d2001dd781e0bfaf934b690 (patch)
tree336f1202ad019d437c19fd5c030e2fca97b16666 /kresources
parentc437f19f371b5678e0772a5f922fc3587864ca4e (diff)
downloadtdepim-f8fb0a6b61511cee7d2001dd781e0bfaf934b690.tar.gz
tdepim-f8fb0a6b61511cee7d2001dd781e0bfaf934b690.zip
Moved the editor open variable out of kocore to remove accidental compilation circular dependency
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1167544 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources')
-rw-r--r--kresources/caldav/Makefile.am2
-rw-r--r--kresources/caldav/resource.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/kresources/caldav/Makefile.am b/kresources/caldav/Makefile.am
index 604976cd7..45c0f2c7c 100644
--- a/kresources/caldav/Makefile.am
+++ b/kresources/caldav/Makefile.am
@@ -15,7 +15,7 @@ libkcal_caldav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
libkcal_caldav_la_LIBADD = \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libkdepim/libkdepim.la \
- -lcaldav -lkorganizer
+ -lcaldav
libkcal_caldav_la_COMPILE_FIRST = prefsskel.h
kde_module_LTLIBRARIES = kcal_caldav.la
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index 58ea5838e..4e1542029 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -38,7 +38,6 @@
#include "resource.h"
#include "reader.h"
#include "writer.h"
-#include <korganizer/kocore.h>
/*=========================================================================
| NAMESPACE
@@ -144,9 +143,6 @@ bool ResourceCalDav::isSaving() {
bool ResourceCalDav::doLoad() {
bool syncCache = true;
- // Make sure no editor windows are open
- if (KOCore::self()->editorWindowOpen() == true) return true;
-
if ((mLoadingQueueReady == false) || (mLoadingQueue.isEmpty() == false) || (mLoader->running() == true) || (isSaving() == true)) {
return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them!
}