summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-19 20:18:42 (UTC)
committer zautrix <zautrix>2004-10-19 20:18:42 (UTC)
commit72fcd35606475a620a8aab7dd4cf9cbaf4b0acee (patch) (side-by-side diff)
tree396f0af18109c1cbc0075d9409743fc2fc1c650b
parenteca49bb06a71980ef61d078904573f25890fc7f2 (diff)
downloadkdepimpi-72fcd35606475a620a8aab7dd4cf9cbaf4b0acee.zip
kdepimpi-72fcd35606475a620a8aab7dd4cf9cbaf4b0acee.tar.gz
kdepimpi-72fcd35606475a620a8aab7dd4cf9cbaf4b0acee.tar.bz2
crypto changes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile24
-rw-r--r--pwmanager/pwmanager/pwmanagerE.pro11
-rw-r--r--pwmanager/pwmanager/pwmdoc.cpp2
3 files changed, 33 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 84f909e..8c6110c 100644
--- a/Makefile
+++ b/Makefile
@@ -38,24 +38,28 @@ SUBDIRS_LDAP_PLUGIN = \
kabc/plugins/ldap
SUBDIRS_MICROMAIL = \
kmicromail/libetpan \
kmicromail/libmailwrapper \
kmicromail
SUBDIRS_GAMMU = \
gammu/emb/common \
gammu/emb/gammu
SUBDIRS_PWMANAGER = \
+ pwmanager/libcrypt/mpi \
+ pwmanager/libcrypt/error \
+ pwmanager/libcrypt/cipher \
+ pwmanager/libcrypt/zlib \
pwmanager/pwmanager
SUBDIRS = \
$(SUBDIRS_MICROKDE) \
$(SUBDIRS_QTOPIA_PLUGIN) \
$(SUBDIRS_OPIE_PLUGIN) \
$(SUBDIRS_SHARP_PLUGIN) \
$(SUBDIRS_LDAP_PLUGIN) \
$(SUBDIRS_MICROMAIL) \
$(SUBDIRS_GAMMU) \
$(SUBDIRS_PWMANAGER)
@@ -195,27 +199,29 @@ variable_test: variable_info
@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
endif
ifdef BUILD_NO_PWMANAGER
@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
endif
@echo --------------------------------------
objects:
for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
mkdir -p libical/lib/$(PLATFORM)
+ mkdir -p pwmanager/libcrypt/$(PLATFORM)
clean:
rm -rf libical/lib/$(PLATFORM)/*;
+ rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
done
install:
cd bin/kdepim; make install
cp -r Pim $(QPEDIR)/apps
cp db2file/db2file $(QPEDIR)/bin/db2file
cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
@@ -256,24 +262,28 @@ tmake: objects \
kabc/plugins/dir/Makefile$(PLATFORM) \
kabc/plugins/ldap/Makefile$(PLATFORM) \
kabc/plugins/opie/Makefile$(PLATFORM) \
kabc/plugins/qtopia/Makefile$(PLATFORM) \
kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
kaddressbook/Makefile$(PLATFORM) \
kmicromail/Makefile$(PLATFORM) \
kmicromail/libetpan/Makefile$(PLATFORM) \
kmicromail/libmailwrapper/Makefile$(PLATFORM) \
gammu/emb/common/Makefile$(PLATFORM) \
gammu/emb/gammu/Makefile$(PLATFORM) \
pwmanager/pwmanager/Makefile$(PLATFORM) \
+ pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
+ pwmanager/libcrypt/error/Makefile$(PLATFORM) \
+ pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
+ pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
@@ -327,12 +337,26 @@ kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
+
+pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
+ cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
+
+pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
+ cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
+
+pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
+ cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
+
+pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
+ cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
+
+
diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro
index 4c3a568..6aa0571 100644
--- a/pwmanager/pwmanager/pwmanagerE.pro
+++ b/pwmanager/pwmanager/pwmanagerE.pro
@@ -3,34 +3,39 @@ CONFIG += qt warn_on
TARGET = pwmpi
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR=$(QPEDIR)/bin
INCLUDEPATH += . ../../ ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include
DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY
#enable this setting if you want debugoutput for pwmanager
#DEFINES += CONFIG_DEBUG
-
+LIBS += -L../libcrypt/$(PLATFORM)
LIBS += -lmicrokde
LIBS += -lmicroqtcompat
LIBS += -lmicrokdepim
LIBS += -L$(QPEDIR)/lib
LIBS += -lqpe
-LIBS += -lz
+LIBS += -lzlib
#LIBS += -lbz2
-LIBS += -lgcrypt
+#LIBS += -lkpmicrogcrypt
+LIBS += -ljpeg
LIBS += $(QTOPIALIB)
+LIBS += -lkpmicrocipher
+LIBS += -lkpmicroerror
+LIBS += -lkpmicrompi
+LIBS += -lstdc++
#INTERFACES = \
#addentrywnd.ui \
#configwnd.ui \
#findwnd.ui \
#getmasterpwwnd.ui \
#pwgenwnd.ui \
#setmasterpwwnd.ui \
#subtbledit.ui
#INTERFACES = \
#subtbledit.ui \
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index f4a1636..e29e3d1 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -337,25 +337,25 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
QString savedFilename(filename);
if (!file) {
if (filename == "")
return e_filename;
if (isDeepLocked()) {
/* We don't need to save any data.
* It's already all on disk, because
* we are deeplocked.
*/
unsetDocStatFlag(DOC_STAT_DISK_DIRTY);
ret = e_success;
- goto out;
+ return ret;
}
} else {
if (*file == "" && filename == "")
return e_filename;
if (*file != "")
filename = *file;
}
wasDeepLocked = isDeepLocked();
if (wasDeepLocked) {
/* We are deeplocked. That means all data is already
* on disk. BUT we need to do saving procedure,