summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-16 15:13:40 (UTC)
committer zautrix <zautrix>2004-09-16 15:13:40 (UTC)
commit02e7ae4983679a787834277176a031286a8310c2 (patch) (side-by-side diff)
treeea7e33e59b86b8fed2b033609d1018a9f245baff
parent68b1f3bce4b6e89bb343b965256537d93e63f7be (diff)
downloadkdepimpi-02e7ae4983679a787834277176a031286a8310c2.zip
kdepimpi-02e7ae4983679a787834277176a031286a8310c2.tar.gz
kdepimpi-02e7ae4983679a787834277176a031286a8310c2.tar.bz2
Foldername fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile31
-rw-r--r--kmicromail/accountitem.cpp2
-rw-r--r--kmicromail/libmailwrapper/mailwrapper.cpp7
-rw-r--r--kmicromail/libmailwrapper/mailwrapper.h2
4 files changed, 34 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index de9d5ce..6856b62 100644
--- a/Makefile
+++ b/Makefile
@@ -47,2 +47,5 @@ SUBDIRS_GAMMU = \
+SUBDIRS_PWMANAGER = \
+ pwmanager/pwmanager
+
SUBDIRS = \
@@ -54,3 +57,4 @@ SUBDIRS = \
$(SUBDIRS_MICROMAIL) \
- $(SUBDIRS_GAMMU)
+ $(SUBDIRS_GAMMU) \
+ $(SUBDIRS_PWMANAGER)
@@ -62,3 +66,4 @@ all: build_microkde \
build_micromail \
- build_gammu
+ build_gammu \
+ build_pwmanager
@@ -121,2 +126,11 @@ build_gammu: variable_test tmake
+build_pwmanager: build_microkde
+ ifdef BUILD_NO_PWMANAGER
+ @echo == pwmanager not build.
+ else
+ for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
+ make -f Makefile$(PLATFORM) || exit 1; popd; \
+ done
+ endif
+
@@ -139,2 +153,3 @@ variable_info:
@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
+ @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
@echo --------------------------------------
@@ -171,2 +186,5 @@ variable_test: variable_info
endif
+ ifdef BUILD_NO_PWMANAGER
+ @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
+ endif
@echo --------------------------------------
@@ -192,2 +210,3 @@ install:
cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
+ cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
@@ -208,2 +227,5 @@ dist:
endif
+ ifndef BUILD_NO_PWMANAGER
+ ./mkipks pwmanager.control
+ endif
./mkipks pim_TAB_icon.control
@@ -233,3 +255,3 @@ tmake: objects \
gammu/emb/gammu/Makefile$(PLATFORM) \
-
+ pwmanager/pwmanager/Makefile$(PLATFORM) \
@@ -303 +325,4 @@ gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" gammuE.pro -o Makefile$(PLATFORM)
+
+pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
+ cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" pwmanagerE.pro -o Makefile$(PLATFORM)
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 59c8abb..12d047a 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -497,3 +497,3 @@ void IMAPviewItem::refreshFolders(bool force)
/* setup the short name */
- item->setText(0,(*it)->getDisplayName().right((*it)->getDisplayName().length()-pos-1));
+ item->setText(0,(*it)->getDisplayName().mid(pos+1));
item = titem;
diff --git a/kmicromail/libmailwrapper/mailwrapper.cpp b/kmicromail/libmailwrapper/mailwrapper.cpp
index 9400649..2ee1ab3 100644
--- a/kmicromail/libmailwrapper/mailwrapper.cpp
+++ b/kmicromail/libmailwrapper/mailwrapper.cpp
@@ -48,7 +48,8 @@ const QString& Folder::Separator()const
-IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no_inf, const QString&aprefix )
- : Folder( name,sep ),m_MaySelect(select),m_NoInferior(no_inf)
+IMAPFolder::IMAPFolder(const QString&t_name,const QString&sep, bool select,bool no_inf, const QString&aprefix )
+ : Folder( t_name,sep ),m_MaySelect(select),m_NoInferior(no_inf)
{
// Decode IMAP foldername
- nameDisplay = IMAPFolder::decodeFolderName( name );
+ nameDisplay = IMAPFolder::decodeFolderName( t_name );
+ name = nameDisplay ;
/*
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h
index cefe64e..2ba908b 100644
--- a/kmicromail/libmailwrapper/mailwrapper.h
+++ b/kmicromail/libmailwrapper/mailwrapper.h
@@ -122,4 +122,4 @@ class IMAPFolder : public Folder
virtual bool no_inferior()const{return m_NoInferior;}
- private:
static QString decodeFolderName( const QString &name );
+ private:
bool m_MaySelect,m_NoInferior;