| -rw-r--r-- | Makefile | 31 | ||||
| -rw-r--r-- | kmicromail/accountitem.cpp | 2 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/mailwrapper.cpp | 7 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/mailwrapper.h | 2 |
4 files changed, 34 insertions, 8 deletions
@@ -45,6 +45,9 @@ SUBDIRS_GAMMU = \ gammu/emb/common \ gammu/emb/gammu +SUBDIRS_PWMANAGER = \ + pwmanager/pwmanager + SUBDIRS = \ $(SUBDIRS_MICROKDE) \ $(SUBDIRS_QTOPIA_PLUGIN) \ @@ -52,7 +55,8 @@ SUBDIRS = \ $(SUBDIRS_SHARP_PLUGIN) \ $(SUBDIRS_LDAP_PLUGIN) \ $(SUBDIRS_MICROMAIL) \ - $(SUBDIRS_GAMMU) + $(SUBDIRS_GAMMU) \ + $(SUBDIRS_PWMANAGER) all: build_microkde \ build_qtopia_plugin \ @@ -60,7 +64,8 @@ all: build_microkde \ build_sharp_plugin \ build_ldap_plugin \ build_micromail \ - build_gammu + build_gammu \ + build_pwmanager build_microkde: variable_test tmake @@ -119,6 +124,15 @@ build_gammu: variable_test tmake done endif +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 + variable_info: @echo -------------------------------------- @@ -137,6 +151,7 @@ variable_info: @echo SHARPDTMSDK=$(SHARPDTMSDK) endif @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) + @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) @echo -------------------------------------- variable_test: variable_info @@ -169,6 +184,9 @@ variable_test: variable_info ifdef BUILD_NO_GAMMU @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 -------------------------------------- @@ -190,6 +208,7 @@ install: 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 + cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop dist: @echo Dont forget to do "make install" before "make dist" @@ -206,6 +225,9 @@ dist: ifndef BUILD_NO_GAMMU ./mkipks kammu.control endif + ifndef BUILD_NO_PWMANAGER + ./mkipks pwmanager.control + endif ./mkipks pim_TAB_icon.control tmake: objects \ @@ -231,7 +253,7 @@ tmake: objects \ kmicromail/libmailwrapper/Makefile$(PLATFORM) \ gammu/emb/common/Makefile$(PLATFORM) \ gammu/emb/gammu/Makefile$(PLATFORM) \ - + pwmanager/pwmanager/Makefile$(PLATFORM) \ @@ -301,3 +323,6 @@ gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro 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 @@ -495,7 +495,7 @@ void IMAPviewItem::refreshFolders(bool force) titem = item; item = new IMAPfolderItem( (*it),pitem,pitem->firstChild(),this); /* 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; } else 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 @@ -46,11 +46,12 @@ const QString& Folder::Separator()const return separator; } -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 ; /* odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; */ 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 @@ -120,8 +120,8 @@ class IMAPFolder : public Folder virtual ~IMAPFolder(); virtual bool may_select()const{return m_MaySelect;} virtual bool no_inferior()const{return m_NoInferior;} - private: static QString decodeFolderName( const QString &name ); + private: bool m_MaySelect,m_NoInferior; }; |