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
@@ -24,64 +24,69 @@ SUBDIRS_MICROKDE = \
24 kalarmd \ 24 kalarmd \
25 kaddressbook 25 kaddressbook
26 26
27SUBDIRS_QTOPIA_PLUGIN = \ 27SUBDIRS_QTOPIA_PLUGIN = \
28 kabc/plugins/qtopia 28 kabc/plugins/qtopia
29 29
30SUBDIRS_OPIE_PLUGIN = \ 30SUBDIRS_OPIE_PLUGIN = \
31 kabc/plugins/opie 31 kabc/plugins/opie
32 32
33SUBDIRS_SHARP_PLUGIN = \ 33SUBDIRS_SHARP_PLUGIN = \
34 kabc/plugins/sharpdtm 34 kabc/plugins/sharpdtm
35 35
36SUBDIRS_LDAP_PLUGIN = \ 36SUBDIRS_LDAP_PLUGIN = \
37 kabc/plugins/ldap 37 kabc/plugins/ldap
38 38
39SUBDIRS_MICROMAIL = \ 39SUBDIRS_MICROMAIL = \
40 kmicromail/libetpan \ 40 kmicromail/libetpan \
41 kmicromail/libmailwrapper \ 41 kmicromail/libmailwrapper \
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
70 75
71build_qtopia_plugin: build_microkde 76build_qtopia_plugin: build_microkde
72 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 77 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
73 make -f Makefile$(PLATFORM) || exit 1; popd; \ 78 make -f Makefile$(PLATFORM) || exit 1; popd; \
74 done 79 done
75 80
76build_opie_plugin: build_microkde 81build_opie_plugin: build_microkde
77 ifdef BUILD_NO_OPIE_PLUGIN 82 ifdef BUILD_NO_OPIE_PLUGIN
78 @echo == opie plugin not build. 83 @echo == opie plugin not build.
79 else 84 else
80 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 85 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
81 make -f Makefile$(PLATFORM) || exit 1; popd; \ 86 make -f Makefile$(PLATFORM) || exit 1; popd; \
82 done 87 done
83 endif 88 endif
84 89
85build_sharp_plugin: build_microkde 90build_sharp_plugin: build_microkde
86 ifdef BUILD_NO_SHARP_PLUGIN 91 ifdef BUILD_NO_SHARP_PLUGIN
87 @echo == ldap plugin not build. 92 @echo == ldap plugin not build.
@@ -98,161 +103,178 @@ build_ldap_plugin: build_microkde
98 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ 103 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
99 make -f Makefile$(PLATFORM) || exit 1; popd; \ 104 make -f Makefile$(PLATFORM) || exit 1; popd; \
100 done 105 done
101 endif 106 endif
102 107
103 108
104build_micromail: build_microkde 109build_micromail: build_microkde
105 ifdef BUILD_NO_MICROMAIL 110 ifdef BUILD_NO_MICROMAIL
106 @echo == kmicromail not build. 111 @echo == kmicromail not build.
107 else 112 else
108 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ 113 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
109 make -f Makefile$(PLATFORM) || exit 1; popd; \ 114 make -f Makefile$(PLATFORM) || exit 1; popd; \
110 done 115 done
111 endif 116 endif
112 117
113build_gammu: variable_test tmake 118build_gammu: variable_test tmake
114 ifdef BUILD_NO_GAMMU 119 ifdef BUILD_NO_GAMMU
115 @echo == gammu not build. 120 @echo == gammu not build.
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)
128 @echo QPEDIR=$(QPEDIR) 142 @echo QPEDIR=$(QPEDIR)
129 @echo OPIEDIR=$(OPIEDIR) 143 @echo OPIEDIR=$(OPIEDIR)
130 @echo PLATFORM=$(PLATFORM) 144 @echo PLATFORM=$(PLATFORM)
131 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 145 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
132 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 146 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
133 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 147 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
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.
146 $(error KDEPIMDIR is not defined) 161 $(error KDEPIMDIR is not defined)
147 endif 162 endif
148 ifndef PLATFORM 163 ifndef PLATFORM
149 @echo PLATFORM is not defined. 164 @echo PLATFORM is not defined.
150 $(error PLATFORM is not defined) 165 $(error PLATFORM is not defined)
151 endif 166 endif
152 ifdef BUILD_NO_LDAP_PLUGIN 167 ifdef BUILD_NO_LDAP_PLUGIN
153 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 168 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
154 endif 169 endif
155 ifdef BUILD_NO_OPIE_PLUGIN 170 ifdef BUILD_NO_OPIE_PLUGIN
156 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 171 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
157 endif 172 endif
158 ifdef BUILD_NO_MICROMAIL 173 ifdef BUILD_NO_MICROMAIL
159 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 174 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
160 endif 175 endif
161 ifdef BUILD_NO_SHARP_PLUGIN 176 ifdef BUILD_NO_SHARP_PLUGIN
162 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 177 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
163 else 178 else
164 ifndef SHARPDTMSDK 179 ifndef SHARPDTMSDK
165 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 180 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
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
178 mkdir -p libical/lib/$(PLATFORM) 196 mkdir -p libical/lib/$(PLATFORM)
179 197
180clean: 198clean:
181 rm -rf libical/lib/$(PLATFORM)/*; 199 rm -rf libical/lib/$(PLATFORM)/*;
182 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 200 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
183 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 201 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
184 done 202 done
185install: 203install:
186 204
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
199 ./mkipks kmicrokdelibs.control 218 ./mkipks kmicrokdelibs.control
200 ./mkipks korganizer.control 219 ./mkipks korganizer.control
201 ./mkipks kaddressbook.control 220 ./mkipks kaddressbook.control
202 ifndef BUILD_NO_MICROMAIL 221 ifndef BUILD_NO_MICROMAIL
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) \
215 libkdepim/Makefile$(PLATFORM) \ 237 libkdepim/Makefile$(PLATFORM) \
216 korganizer/Makefile$(PLATFORM) \ 238 korganizer/Makefile$(PLATFORM) \
217 kalarmd/Makefile$(PLATFORM) \ 239 kalarmd/Makefile$(PLATFORM) \
218 libical/src/libical/Makefile$(PLATFORM) \ 240 libical/src/libical/Makefile$(PLATFORM) \
219 libical/src/libicalss/Makefile$(PLATFORM) \ 241 libical/src/libicalss/Makefile$(PLATFORM) \
220 kabc/Makefile$(PLATFORM) \ 242 kabc/Makefile$(PLATFORM) \
221 kabc/formats/binary/Makefile$(PLATFORM) \ 243 kabc/formats/binary/Makefile$(PLATFORM) \
222 kabc/plugins/file/Makefile$(PLATFORM) \ 244 kabc/plugins/file/Makefile$(PLATFORM) \
223 kabc/plugins/dir/Makefile$(PLATFORM) \ 245 kabc/plugins/dir/Makefile$(PLATFORM) \
224 kabc/plugins/ldap/Makefile$(PLATFORM) \ 246 kabc/plugins/ldap/Makefile$(PLATFORM) \
225 kabc/plugins/opie/Makefile$(PLATFORM) \ 247 kabc/plugins/opie/Makefile$(PLATFORM) \
226 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 248 kabc/plugins/qtopia/Makefile$(PLATFORM) \
227 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 249 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
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
241microkde/Makefile$(PLATFORM): microkde/microkdeE.pro 263microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
242 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM) 264 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
243 265
244libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro 266libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
245 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM) 267 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
246 268
247 269
248libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro 270libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
249 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM) 271 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
250 272
251kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro 273kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
252 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM) 274 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
253 275
254korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro 276korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
255 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM) 277 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
256 278
257libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro 279libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
258 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM) 280 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
@@ -280,24 +302,27 @@ kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
280 302
281kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro 303kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
282 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) 304 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
283 305
284kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro 306kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
285 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM) 307 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
286 308
287kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro 309kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
288 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) 310 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
289 311
290kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro 312kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
291 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM) 313 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
292 314
293kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro 315kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
294 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM) 316 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
295 317
296kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro 318kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
297 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) 319 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
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
@@ -474,49 +474,49 @@ void IMAPviewItem::refreshFolders(bool force)
474 for ( it = folders->begin(); it!=folders->end(); ++it) 474 for ( it = folders->begin(); it!=folders->end(); ++it)
475 { 475 {
476 if ((*it)->getDisplayName().lower()=="inbox") 476 if ((*it)->getDisplayName().lower()=="inbox")
477 { 477 {
478 item = new IMAPfolderItem( (*it), this , item ); 478 item = new IMAPfolderItem( (*it), this , item );
479 folders->remove(it); 479 folders->remove(it);
480 break; 480 break;
481 } 481 }
482 } 482 }
483 for ( it = folders->begin(); it!=folders->end(); ++it) 483 for ( it = folders->begin(); it!=folders->end(); ++it)
484 { 484 {
485 fname = (*it)->getDisplayName(); 485 fname = (*it)->getDisplayName();
486 currentFolders.append((*it)->getName()); 486 currentFolders.append((*it)->getName());
487 pos = fname.findRev((*it)->Separator()); 487 pos = fname.findRev((*it)->Separator());
488 if (pos != -1) 488 if (pos != -1)
489 { 489 {
490 fname = fname.left(pos); 490 fname = fname.left(pos);
491 } 491 }
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 }
505 } 505 }
506 delete folders; 506 delete folders;
507} 507}
508 508
509QPopupMenu * IMAPviewItem::getContextMenu() 509QPopupMenu * IMAPviewItem::getContextMenu()
510{ 510{
511 QPopupMenu *m = new QPopupMenu(0); 511 QPopupMenu *m = new QPopupMenu(0);
512 if (m) 512 if (m)
513 { 513 {
514 if (!account->getOffline()) 514 if (!account->getOffline())
515 { 515 {
516 m->insertItem(QObject::tr("Refresh folder list",contextName),0); 516 m->insertItem(QObject::tr("Refresh folder list",contextName),0);
517 m->insertItem(QObject::tr("Create new folder",contextName),1); 517 m->insertItem(QObject::tr("Create new folder",contextName),1);
518 m->insertSeparator(); 518 m->insertSeparator();
519 m->insertItem(QObject::tr("Disconnect",contextName),2); 519 m->insertItem(QObject::tr("Disconnect",contextName),2);
520 m->insertItem(QObject::tr("Set offline",contextName),3); 520 m->insertItem(QObject::tr("Set offline",contextName),3);
521 m->insertSeparator(); 521 m->insertSeparator();
522 m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS); 522 m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
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
@@ -25,53 +25,54 @@ using namespace Opie::Core;
25Attachment::Attachment( QString lnk ) 25Attachment::Attachment( QString lnk )
26{ 26{
27 doc = lnk; 27 doc = lnk;
28 size = QFileInfo( doc ).size(); 28 size = QFileInfo( doc ).size();
29 mPix = SmallIcon( "files" ); 29 mPix = SmallIcon( "files" );
30} 30}
31 31
32Folder::Folder(const QString&tmp_name, const QString&sep ) 32Folder::Folder(const QString&tmp_name, const QString&sep )
33{ 33{
34 name = tmp_name; 34 name = tmp_name;
35 nameDisplay = name; 35 nameDisplay = name;
36 separator = sep; 36 separator = sep;
37 prefix = ""; 37 prefix = "";
38} 38}
39 39
40Folder::~Folder() 40Folder::~Folder()
41{ 41{
42} 42}
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) {
60 if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) { 61 if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) {
61 nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length()); 62 nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length());
62 } 63 }
63 } 64 }
64} 65}
65 66
66IMAPFolder::~IMAPFolder() 67IMAPFolder::~IMAPFolder()
67{ 68{
68} 69}
69 70
70static unsigned char base64chars[] = 71static unsigned char base64chars[] =
71 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,"; 72 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
72 73
73/** 74/**
74 * Decodes base64 encoded parts of the imapfolder name 75 * Decodes base64 encoded parts of the imapfolder name
75 * Code taken from kde cvs: kdebase/kioslave/imap4/rfcdecoder.cc 76 * Code taken from kde cvs: kdebase/kioslave/imap4/rfcdecoder.cc
76 */ 77 */
77QString IMAPFolder::decodeFolderName( const QString &name ) 78QString IMAPFolder::decodeFolderName( const QString &name )
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
@@ -99,30 +99,30 @@ public:
99 virtual bool may_select()const{return true;} 99 virtual bool may_select()const{return true;}
100 virtual bool no_inferior()const{return true;} 100 virtual bool no_inferior()const{return true;}
101 const QString&Separator()const; 101 const QString&Separator()const;
102 102
103protected: 103protected:
104 QString nameDisplay, name, separator,prefix; 104 QString nameDisplay, name, separator,prefix;
105}; 105};
106 106
107typedef Opie::Core::OSmartPointer<Folder> FolderP; 107typedef Opie::Core::OSmartPointer<Folder> FolderP;
108 108
109class MHFolder : public Folder 109class MHFolder : public Folder
110{ 110{
111public: 111public:
112 MHFolder(const QString&disp_name,const QString&mbox); 112 MHFolder(const QString&disp_name,const QString&mbox);
113 virtual ~MHFolder(); 113 virtual ~MHFolder();
114}; 114};
115 115
116class IMAPFolder : public Folder 116class 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