summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-16 15:13:40 (UTC)
committer zautrix <zautrix>2004-09-16 15:13:40 (UTC)
commit02e7ae4983679a787834277176a031286a8310c2 (patch) (unidiff)
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
@@ -42,28 +42,33 @@ SUBDIRS_MICROMAIL = \
42 kmicromail 42 kmicromail
43 43
44SUBDIRS_GAMMU = \ 44SUBDIRS_GAMMU = \
45 gammu/emb/common \ 45 gammu/emb/common \
46 gammu/emb/gammu 46 gammu/emb/gammu
47 47
48SUBDIRS_PWMANAGER = \
49 pwmanager/pwmanager
50
48SUBDIRS = \ 51SUBDIRS = \
49 $(SUBDIRS_MICROKDE) \ 52 $(SUBDIRS_MICROKDE) \
50 $(SUBDIRS_QTOPIA_PLUGIN) \ 53 $(SUBDIRS_QTOPIA_PLUGIN) \
51 $(SUBDIRS_OPIE_PLUGIN) \ 54 $(SUBDIRS_OPIE_PLUGIN) \
52 $(SUBDIRS_SHARP_PLUGIN) \ 55 $(SUBDIRS_SHARP_PLUGIN) \
53 $(SUBDIRS_LDAP_PLUGIN) \ 56 $(SUBDIRS_LDAP_PLUGIN) \
54 $(SUBDIRS_MICROMAIL) \ 57 $(SUBDIRS_MICROMAIL) \
55 $(SUBDIRS_GAMMU) 58 $(SUBDIRS_GAMMU) \
59 $(SUBDIRS_PWMANAGER)
56 60
57all: build_microkde \ 61all: build_microkde \
58 build_qtopia_plugin \ 62 build_qtopia_plugin \
59 build_opie_plugin \ 63 build_opie_plugin \
60 build_sharp_plugin \ 64 build_sharp_plugin \
61 build_ldap_plugin \ 65 build_ldap_plugin \
62 build_micromail \ 66 build_micromail \
63 build_gammu 67 build_gammu \
68 build_pwmanager
64 69
65 70
66build_microkde: variable_test tmake 71build_microkde: variable_test tmake
67 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 72 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
68 make -f Makefile$(PLATFORM) || exit 1; popd; \ 73 make -f Makefile$(PLATFORM) || exit 1; popd; \
69 done 74 done
@@ -116,12 +121,21 @@ build_gammu: variable_test tmake
116 else 121 else
117 for i in $(SUBDIRS_GAMMU); do pushd $$i; \ 122 for i in $(SUBDIRS_GAMMU); do pushd $$i; \
118 make -f Makefile$(PLATFORM) || exit 1; popd; \ 123 make -f Makefile$(PLATFORM) || exit 1; popd; \
119 done 124 done
120 endif 125 endif
121 126
127build_pwmanager: build_microkde
128 ifdef BUILD_NO_PWMANAGER
129 @echo == pwmanager not build.
130 else
131 for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
132 make -f Makefile$(PLATFORM) || exit 1; popd; \
133 done
134 endif
135
122 136
123variable_info: 137variable_info:
124 @echo -------------------------------------- 138 @echo --------------------------------------
125 @echo KDEPIM buildsystem, variableinfo... 139 @echo KDEPIM buildsystem, variableinfo...
126 @echo KDEPIMDIR=$(KDEPIMDIR) 140 @echo KDEPIMDIR=$(KDEPIMDIR)
127 @echo QTDIR=$(QTDIR) 141 @echo QTDIR=$(QTDIR)
@@ -134,12 +148,13 @@ variable_info:
134 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 148 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
135 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 149 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
136 ifndef BUILD_NO_SHARP_PLUGIN 150 ifndef BUILD_NO_SHARP_PLUGIN
137 @echo SHARPDTMSDK=$(SHARPDTMSDK) 151 @echo SHARPDTMSDK=$(SHARPDTMSDK)
138 endif 152 endif
139 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 153 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
154 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
140 @echo -------------------------------------- 155 @echo --------------------------------------
141 156
142variable_test: variable_info 157variable_test: variable_info
143 @echo KDEPIM buildsystem, variablecheck... 158 @echo KDEPIM buildsystem, variablecheck...
144 ifndef KDEPIMDIR 159 ifndef KDEPIMDIR
145 @echo KDEPIMDIR is not defined. 160 @echo KDEPIMDIR is not defined.
@@ -166,12 +181,15 @@ variable_test: variable_info
166 $(error SHARPDTMSDK is not defined) 181 $(error SHARPDTMSDK is not defined)
167 endif 182 endif
168 endif 183 endif
169 ifdef BUILD_NO_GAMMU 184 ifdef BUILD_NO_GAMMU
170 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) 185 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
171 endif 186 endif
187 ifdef BUILD_NO_PWMANAGER
188 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
189 endif
172 @echo -------------------------------------- 190 @echo --------------------------------------
173 191
174 192
175objects: 193objects:
176 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 194 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
177 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 195 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
@@ -187,12 +205,13 @@ install:
187 cd bin/kdepim; make install 205 cd bin/kdepim; make install
188 cp -r Pim $(QPEDIR)/apps 206 cp -r Pim $(QPEDIR)/apps
189 cp db2file/db2file $(QPEDIR)/bin/db2file 207 cp db2file/db2file $(QPEDIR)/bin/db2file
190 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 208 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
191 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 209 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
192 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop 210 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
211 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
193 212
194dist: 213dist:
195 @echo Dont forget to do "make install" before "make dist" 214 @echo Dont forget to do "make install" before "make dist"
196 rm -f *arm.ipk 215 rm -f *arm.ipk
197 rm -f *~ 216 rm -f *~
198 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim 217 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
@@ -203,12 +222,15 @@ dist:
203 ./mkipks kopiemail.control 222 ./mkipks kopiemail.control
204 endif 223 endif
205 ./mkipks korganizer-alarm.control 224 ./mkipks korganizer-alarm.control
206 ifndef BUILD_NO_GAMMU 225 ifndef BUILD_NO_GAMMU
207 ./mkipks kammu.control 226 ./mkipks kammu.control
208 endif 227 endif
228 ifndef BUILD_NO_PWMANAGER
229 ./mkipks pwmanager.control
230 endif
209 ./mkipks pim_TAB_icon.control 231 ./mkipks pim_TAB_icon.control
210 232
211tmake: objects \ 233tmake: objects \
212 qtcompat/Makefile$(PLATFORM) \ 234 qtcompat/Makefile$(PLATFORM) \
213 microkde/Makefile$(PLATFORM) \ 235 microkde/Makefile$(PLATFORM) \
214 libkcal/Makefile$(PLATFORM) \ 236 libkcal/Makefile$(PLATFORM) \
@@ -228,13 +250,13 @@ tmake: objects \
228 kaddressbook/Makefile$(PLATFORM) \ 250 kaddressbook/Makefile$(PLATFORM) \
229 kmicromail/Makefile$(PLATFORM) \ 251 kmicromail/Makefile$(PLATFORM) \
230 kmicromail/libetpan/Makefile$(PLATFORM) \ 252 kmicromail/libetpan/Makefile$(PLATFORM) \
231 kmicromail/libmailwrapper/Makefile$(PLATFORM) \ 253 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
232 gammu/emb/common/Makefile$(PLATFORM) \ 254 gammu/emb/common/Makefile$(PLATFORM) \
233 gammu/emb/gammu/Makefile$(PLATFORM) \ 255 gammu/emb/gammu/Makefile$(PLATFORM) \
234 256 pwmanager/pwmanager/Makefile$(PLATFORM) \
235 257
236 258
237 259
238qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro 260qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
239 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) 261 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
240 262
@@ -298,6 +320,9 @@ kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmail
298 320
299gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro 321gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
300 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" commonE.pro -o Makefile$(PLATFORM) 322 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" commonE.pro -o Makefile$(PLATFORM)
301 323
302gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro 324gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
303 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" gammuE.pro -o Makefile$(PLATFORM) 325 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" gammuE.pro -o Makefile$(PLATFORM)
326
327pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
328 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)
492 IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname); 492 IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname);
493 if (pitem) 493 if (pitem)
494 { 494 {
495 titem = item; 495 titem = item;
496 item = new IMAPfolderItem( (*it),pitem,pitem->firstChild(),this); 496 item = new IMAPfolderItem( (*it),pitem,pitem->firstChild(),this);
497 /* setup the short name */ 497 /* setup the short name */
498 item->setText(0,(*it)->getDisplayName().right((*it)->getDisplayName().length()-pos-1)); 498 item->setText(0,(*it)->getDisplayName().mid(pos+1));
499 item = titem; 499 item = titem;
500 } 500 }
501 else 501 else
502 { 502 {
503 item = new IMAPfolderItem( (*it), this , item ); 503 item = new IMAPfolderItem( (*it), this , item );
504 } 504 }
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()
43 43
44const QString& Folder::Separator()const 44const QString& Folder::Separator()const
45{ 45{
46 return separator; 46 return separator;
47} 47}
48 48
49IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no_inf, const QString&aprefix ) 49IMAPFolder::IMAPFolder(const QString&t_name,const QString&sep, bool select,bool no_inf, const QString&aprefix )
50 : Folder( name,sep ),m_MaySelect(select),m_NoInferior(no_inf) 50 : Folder( t_name,sep ),m_MaySelect(select),m_NoInferior(no_inf)
51{ 51{
52 // Decode IMAP foldername 52 // Decode IMAP foldername
53 nameDisplay = IMAPFolder::decodeFolderName( name ); 53 nameDisplay = IMAPFolder::decodeFolderName( t_name );
54 name = nameDisplay ;
54 /* 55 /*
55 odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; 56 odebug << "folder " + name + " - displayed as " + nameDisplay << oendl;
56 */ 57 */
57 prefix = aprefix; 58 prefix = aprefix;
58 59
59 if (prefix.length()>0) { 60 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
117{ 117{
118 public: 118 public:
119 IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" ); 119 IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" );
120 virtual ~IMAPFolder(); 120 virtual ~IMAPFolder();
121 virtual bool may_select()const{return m_MaySelect;} 121 virtual bool may_select()const{return m_MaySelect;}
122 virtual bool no_inferior()const{return m_NoInferior;} 122 virtual bool no_inferior()const{return m_NoInferior;}
123 private:
124 static QString decodeFolderName( const QString &name ); 123 static QString decodeFolderName( const QString &name );
124 private:
125 bool m_MaySelect,m_NoInferior; 125 bool m_MaySelect,m_NoInferior;
126}; 126};
127 127
128#endif 128#endif