summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -42,28 +42,33 @@ SUBDIRS_MICROMAIL = \
kmicromail
SUBDIRS_GAMMU = \
gammu/emb/common \
gammu/emb/gammu
+SUBDIRS_PWMANAGER = \
+ pwmanager/pwmanager
+
SUBDIRS = \
$(SUBDIRS_MICROKDE) \
$(SUBDIRS_QTOPIA_PLUGIN) \
$(SUBDIRS_OPIE_PLUGIN) \
$(SUBDIRS_SHARP_PLUGIN) \
$(SUBDIRS_LDAP_PLUGIN) \
$(SUBDIRS_MICROMAIL) \
- $(SUBDIRS_GAMMU)
+ $(SUBDIRS_GAMMU) \
+ $(SUBDIRS_PWMANAGER)
all: build_microkde \
build_qtopia_plugin \
build_opie_plugin \
build_sharp_plugin \
build_ldap_plugin \
build_micromail \
- build_gammu
+ build_gammu \
+ build_pwmanager
build_microkde: variable_test tmake
for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
make -f Makefile$(PLATFORM) || exit 1; popd; \
done
@@ -116,12 +121,21 @@ build_gammu: variable_test tmake
else
for i in $(SUBDIRS_GAMMU); do pushd $$i; \
make -f Makefile$(PLATFORM) || exit 1; popd; \
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 --------------------------------------
@echo KDEPIM buildsystem, variableinfo...
@echo KDEPIMDIR=$(KDEPIMDIR)
@echo QTDIR=$(QTDIR)
@@ -134,12 +148,13 @@ variable_info:
@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
ifndef BUILD_NO_SHARP_PLUGIN
@echo SHARPDTMSDK=$(SHARPDTMSDK)
endif
@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
+ @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
@echo --------------------------------------
variable_test: variable_info
@echo KDEPIM buildsystem, variablecheck...
ifndef KDEPIMDIR
@echo KDEPIMDIR is not defined.
@@ -166,12 +181,15 @@ variable_test: variable_info
$(error SHARPDTMSDK is not defined)
endif
endif
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 --------------------------------------
objects:
for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
@@ -187,12 +205,13 @@ 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
+ cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
dist:
@echo Dont forget to do "make install" before "make dist"
rm -f *arm.ipk
rm -f *~
cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
@@ -203,12 +222,15 @@ dist:
./mkipks kopiemail.control
endif
./mkipks korganizer-alarm.control
ifndef BUILD_NO_GAMMU
./mkipks kammu.control
endif
+ ifndef BUILD_NO_PWMANAGER
+ ./mkipks pwmanager.control
+ endif
./mkipks pim_TAB_icon.control
tmake: objects \
qtcompat/Makefile$(PLATFORM) \
microkde/Makefile$(PLATFORM) \
libkcal/Makefile$(PLATFORM) \
@@ -228,13 +250,13 @@ tmake: objects \
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) \
qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
@@ -298,6 +320,9 @@ kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmail
gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" commonE.pro -o Makefile$(PLATFORM)
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
@@ -492,13 +492,13 @@ void IMAPviewItem::refreshFolders(bool force)
IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname);
if (pitem)
{
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
{
item = new IMAPfolderItem( (*it), this , item );
}
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
@@ -43,17 +43,18 @@ Folder::~Folder()
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;
*/
prefix = aprefix;
if (prefix.length()>0) {
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
@@ -117,12 +117,12 @@ class IMAPFolder : public Folder
{
public:
IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" );
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;
};
#endif