1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00

Merge branch 'issue549'

Conflicts:
	src/com/fsck/k9/Account.java
	src/com/fsck/k9/mail/store/WebDavStore.java
This commit is contained in:
cketti 2011-11-05 18:47:55 +01:00
commit 88a2dd6289
302 changed files with 6024 additions and 1286 deletions

View File

@ -67,7 +67,7 @@
<activity <activity
android:name="com.fsck.k9.activity.Accounts" android:name="com.fsck.k9.activity.Accounts"
android:launchMode="singleInstance" android:launchMode="singleTask"
android:configChanges="locale" android:configChanges="locale"
android:label="@string/app_name"> android:label="@string/app_name">
<intent-filter> <intent-filter>
@ -75,6 +75,12 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<data android:mimeType="application/x-k9settings" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
</intent-filter>
</activity> </activity>
<activity <activity

0
assets/emoticons/24hours.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

0
assets/emoticons/airplane.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 130 B

After

Width:  |  Height:  |  Size: 130 B

0
assets/emoticons/angry.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 145 B

After

Width:  |  Height:  |  Size: 145 B

0
assets/emoticons/annoy.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

0
assets/emoticons/apple.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 248 B

After

Width:  |  Height:  |  Size: 248 B

0
assets/emoticons/appli01.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 132 B

0
assets/emoticons/appli02.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 141 B

0
assets/emoticons/aquarius.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 179 B

0
assets/emoticons/aries.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B

0
assets/emoticons/art.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 186 B

0
assets/emoticons/atm.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 166 B

After

Width:  |  Height:  |  Size: 166 B

0
assets/emoticons/bag.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 154 B

After

Width:  |  Height:  |  Size: 154 B

0
assets/emoticons/ban.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 183 B

0
assets/emoticons/banana.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

0
assets/emoticons/bank.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 240 B

0
assets/emoticons/bar.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 218 B

0
assets/emoticons/baseball.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 196 B

0
assets/emoticons/basketball.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 271 B

0
assets/emoticons/bearing.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 148 B

0
assets/emoticons/beer.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

0
assets/emoticons/bell.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 176 B

After

Width:  |  Height:  |  Size: 176 B

0
assets/emoticons/bicycle.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

0
assets/emoticons/birthday.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 262 B

0
assets/emoticons/bleah.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 169 B

0
assets/emoticons/bomb.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

0
assets/emoticons/book.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 139 B

After

Width:  |  Height:  |  Size: 139 B

0
assets/emoticons/bottle.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 185 B

0
assets/emoticons/boutique.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 163 B

After

Width:  |  Height:  |  Size: 163 B

0
assets/emoticons/bread.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 252 B

After

Width:  |  Height:  |  Size: 252 B

0
assets/emoticons/bud.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 164 B

After

Width:  |  Height:  |  Size: 164 B

0
assets/emoticons/building.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 160 B

After

Width:  |  Height:  |  Size: 160 B

0
assets/emoticons/bullettrain.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 166 B

After

Width:  |  Height:  |  Size: 166 B

0
assets/emoticons/bus.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 224 B

0
assets/emoticons/by-d.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 124 B

0
assets/emoticons/cafe.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 181 B

0
assets/emoticons/cake.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 238 B

0
assets/emoticons/camera.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

0
assets/emoticons/cancer.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 153 B

After

Width:  |  Height:  |  Size: 153 B

0
assets/emoticons/capricornus.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 177 B

0
assets/emoticons/car.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 159 B

After

Width:  |  Height:  |  Size: 159 B

0
assets/emoticons/carouselpony.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 184 B

After

Width:  |  Height:  |  Size: 184 B

0
assets/emoticons/cat.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

0
assets/emoticons/catface.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 82 B

After

Width:  |  Height:  |  Size: 82 B

0
assets/emoticons/cd.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 194 B

0
assets/emoticons/chair.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 145 B

After

Width:  |  Height:  |  Size: 145 B

0
assets/emoticons/cherry.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 169 B

0
assets/emoticons/cherryblossom.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 187 B

0
assets/emoticons/chick.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

0
assets/emoticons/clear.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 171 B

After

Width:  |  Height:  |  Size: 171 B

0
assets/emoticons/clip.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 133 B

After

Width:  |  Height:  |  Size: 133 B

0
assets/emoticons/clock.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

0
assets/emoticons/cloud.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

0
assets/emoticons/clover.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 144 B

After

Width:  |  Height:  |  Size: 144 B

0
assets/emoticons/club.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 132 B

0
assets/emoticons/coldsweats01.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 215 B

0
assets/emoticons/coldsweats02.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 222 B

0
assets/emoticons/confident.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 83 B

After

Width:  |  Height:  |  Size: 83 B

0
assets/emoticons/copyright.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 129 B

After

Width:  |  Height:  |  Size: 129 B

0
assets/emoticons/crown.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 181 B

0
assets/emoticons/crying.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

0
assets/emoticons/cute.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 127 B

0
assets/emoticons/d-point.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 132 B

0
assets/emoticons/danger.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

0
assets/emoticons/dash.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 130 B

After

Width:  |  Height:  |  Size: 130 B

0
assets/emoticons/delicious.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 131 B

After

Width:  |  Height:  |  Size: 131 B

0
assets/emoticons/denim.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 145 B

After

Width:  |  Height:  |  Size: 145 B

0
assets/emoticons/despair.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 140 B

0
assets/emoticons/diamond.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 119 B

After

Width:  |  Height:  |  Size: 119 B

0
assets/emoticons/dog.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 137 B

After

Width:  |  Height:  |  Size: 137 B

0
assets/emoticons/dollar.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 188 B

0
assets/emoticons/door.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 159 B

After

Width:  |  Height:  |  Size: 159 B

0
assets/emoticons/down.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 123 B

After

Width:  |  Height:  |  Size: 123 B

0
assets/emoticons/downwardleft.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 109 B

After

Width:  |  Height:  |  Size: 109 B

0
assets/emoticons/downwardright.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 108 B

After

Width:  |  Height:  |  Size: 108 B

0
assets/emoticons/drama.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 168 B

0
assets/emoticons/ear.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 104 B

After

Width:  |  Height:  |  Size: 104 B

0
assets/emoticons/eight.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

0
assets/emoticons/empty.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 165 B

0
assets/emoticons/end.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 111 B

0
assets/emoticons/enter.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 126 B

0
assets/emoticons/event.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 167 B

After

Width:  |  Height:  |  Size: 167 B

0
assets/emoticons/eye.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 125 B

0
assets/emoticons/eyeglass.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 132 B

0
assets/emoticons/fastfood.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 243 B

0
assets/emoticons/faxto.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 199 B

0
assets/emoticons/fish.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 172 B

0
assets/emoticons/five.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

0
assets/emoticons/flag.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 145 B

After

Width:  |  Height:  |  Size: 145 B

0
assets/emoticons/flair.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 223 B

After

Width:  |  Height:  |  Size: 223 B

0
assets/emoticons/foot.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 94 B

After

Width:  |  Height:  |  Size: 94 B

0
assets/emoticons/four.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

0
assets/emoticons/free.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 110 B

After

Width:  |  Height:  |  Size: 110 B

0
assets/emoticons/freedial.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 130 B

After

Width:  |  Height:  |  Size: 130 B

0
assets/emoticons/fuji.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

0
assets/emoticons/full.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 171 B

After

Width:  |  Height:  |  Size: 171 B

0
assets/emoticons/fullmoon.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 144 B

After

Width:  |  Height:  |  Size: 144 B

0
assets/emoticons/game.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 156 B

0
assets/emoticons/gasstation.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

0
assets/emoticons/gawk.gif Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 138 B

Some files were not shown because too many files have changed in this diff Show More