[Evolution] Fixes bug #273868, #300113, #302831

[Shreyas]

--=-TBsyGEzjIcJchM12R2hr
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hey,

The patch fixes a couple of issues related to Offline mode ( providers
which use Camel Offline Store ) and also removes the "Going Offline"
dialog as that blocks other operations while connections are being
dropped. The state change is being effectively handled by the offline/
online toggle icon which listens to the state change progress.  

Cheers,
Shreyas

--=-TBsyGEzjIcJchM12R2hr
Content-Disposition: attachment; filename=camel-offline-store-issue-fix.diff
Content-Type: text/x-patch; name=camel-offline-store-issue-fix.diff; charset=UTF-8
Content-Transfer-Encoding: base64

LS0tIENoYW5nZUxvZwkyMDA1LTA1LTAzIDE2OjA4OjM1LjAwMDAwMDAwMCArMDUzMA0KKysrIENo
YW5nZUxvZwkyMDA1LTA1LTA2IDE1OjUxOjQ4LjAwMDAwMDAwMCArMDUzMA0KQEAgLTEsNCArMSwx
MSBAQA0KKzIwMDUtMDUtMDYgIFNocmV5YXMgU3Jpbml2YXNhbgk8c3NocmV5YXNAbm92ZWxsLmNv
bT4NCisNCisJKiBGaXhlcyBidWcgIzI3Mzg2OCwgIzMwMDExMywgIzMwMjgzMS4NCisJDQorCSog
bWFpbC1vZmZsaW5lLWhhbmRsZXIuYyA6IEFkZCBjaGVjayBmb3IgQ2FtZWwgT2ZmbGluZQ0KKwlz
dG9yZSBjaGVjayB0byBpc19zZXJ2aWNlX3JlbGV2YW50Lg0KKw0KIDIwMDUtMDUtMDMgIFJhZGVr
IERvdWxpayAgPHJvZG9Ac2l0ZT4NCiANCiAJKiBlbS1mb3JtYXQtaHRtbC1kaXNwbGF5LmM6IHJl
bW92ZWQgaW5jbHVkZSBvZiBodG1saW50ZXJ2YWwuaCBhcw0KLS0tIG1haWwtb2ZmbGluZS1oYW5k
bGVyLmMJMjAwNC0wMy0xNyAxNTozMzo1OC4wMDAwMDAwMDAgKzA1MzANCisrKyBtYWlsLW9mZmxp
bmUtaGFuZGxlci5jCTIwMDUtMDUtMDYgMTU6MTk6NTMuMDAwMDAwMDAwICswNTMwDQpAQCAtMzMs
NiArMzMsNyBAQA0KICNpbmNsdWRlICJlbS1mb2xkZXItdHJlZS5oIg0KIA0KICNpbmNsdWRlIDxj
YW1lbC9jYW1lbC1kaXNjby1zdG9yZS5oPg0KKyNpbmNsdWRlIDxjYW1lbC9jYW1lbC1vZmZsaW5l
LXN0b3JlLmg+DQogI2luY2x1ZGUgIm1haWwtc2Vzc2lvbi5oIg0KIA0KICNpbmNsdWRlIDxndGsv
Z3RrbWFpbi5oPg0KQEAgLTU2LDggKzU3LDEwIEBAIHNlcnZpY2VfaXNfcmVsZXZhbnQgKENhbWVs
U2VydmljZSAqc2VydmkNCiAJaWYgKENBTUVMX0lTX0RJU0NPX1NUT1JFIChzZXJ2aWNlKSAmJg0K
IAkgICAgY2FtZWxfZGlzY29fc3RvcmVfc3RhdHVzIChDQU1FTF9ESVNDT19TVE9SRSAoc2Vydmlj
ZSkpID09IENBTUVMX0RJU0NPX1NUT1JFX09GRkxJTkUpDQogCQkJcmV0dXJuICFnb2luZ19vZmZs
aW5lOw0KLQ0KKwllbHNlIGlmICggQ0FNRUxfSVNfT0ZGTElORV9TVE9SRSAoc2VydmljZSkgJiYg
DQorCQkgIENBTUVMX09GRkxJTkVfU1RPUkUgKCBzZXJ2aWNlICktPnN0YXRlID09IENBTUVMX09G
RkxJTkVfU1RPUkVfTkVUV09SS19VTkFWQUlMICkNCisJCQkJcmV0dXJuICFnb2luZ19vZmZsaW5l
Ow0KIAlyZXR1cm4gc2VydmljZS0+c3RhdHVzICE9IENBTUVMX1NFUlZJQ0VfRElTQ09OTkVDVEVE
Ow0KIH0NCiANCi0tLSBDaGFuZ2VMb2cJMjAwNS0wNS0wMiAxNTozMzoyOS4wMDAwMDAwMDAgKzA1
MzANCisrKyBDaGFuZ2VMb2cJMjAwNS0wNS0wNiAxNTo1NjoyNS4wMDAwMDAwMDAgKzA1MzANCkBA
IC0xLDQgKzEsOCBAQA0KKzIwMDUtMDUtMDYgIFNocmV5YXMgU3Jpbml2YXNhbgk8c3NocmV5YXNA
bm92ZWxsLmNvbT4NCisNCisJKiBlLXNoZWxsLW9mZmxpbmUtaGFuZGxlci5jOiBSZW1vdmUgdGhl
IGdvLT5vZmZsaW5lIGRpYWxvZy4NCisJDQogMjAwNS0wNS0wMiAgSlAgUm9zZXZlYXIgIDxqcHJA
bm92ZWxsLmNvbT4NCiANCiAJKiBFdm9sdXRpb24uaWRsOiByZW1vdmUgRXZvbHV0aW9uLWNvbW1v
bi5pZGwNCi0tLSBlLXNoZWxsLW9mZmxpbmUtaGFuZGxlci5jCTIwMDUtMDEtMjEgMjE6MzE6NTQu
MDAwMDAwMDAwICswNTMwDQorKysgZS1zaGVsbC1vZmZsaW5lLWhhbmRsZXIuYwkyMDA1LTA1LTA2
IDE1OjM3OjU4LjAwMDAwMDAwMCArMDUzMA0KQEAgLTg2LDEwICs4Niw2IEBAIHR5cGVkZWYgc3Ry
dWN0IF9Db21wb25lbnRJbmZvIENvbXBvbmVudEkNCiBzdHJ1Y3QgX0VTaGVsbE9mZmxpbmVIYW5k
bGVyUHJpdmF0ZSB7DQogCUVTaGVsbCAqc2hlbGw7DQogDQotCUd0a1dpbmRvdyAqcGFyZW50X3dp
bmRvdzsNCi0NCi0JR2xhZGVYTUwgKmRpYWxvZ19ndWk7DQotDQogCWludCBudW1fdG90YWxfY29u
bmVjdGlvbnM7DQogCUdIYXNoVGFibGUgKmlkX3RvX2NvbXBvbmVudF9pbmZvOw0KIA0KQEAgLTIw
OSw4ICsyMDUsNiBAQCBpbXBsX09mZmxpbmVQcm9ncmVzc0xpc3RlbmVyX3VwZGF0ZVByb2dyDQog
CUNPUkJBX2ZyZWUgKGNvbXBvbmVudF9pbmZvLT5hY3RpdmVfY29ubmVjdGlvbl9saXN0KTsNCiAJ
Y29tcG9uZW50X2luZm8tPmFjdGl2ZV9jb25uZWN0aW9uX2xpc3QgPSBkdXBsaWNhdGVfY29ubmVj
dGlvbl9saXN0IChjdXJyZW50X2FjdGl2ZV9jb25uZWN0aW9ucyk7DQogDQotCXVwZGF0ZV9kaWFs
b2dfY2xpc3QgKG9mZmxpbmVfaGFuZGxlcik7DQotDQogCWlmIChwcml2LT5udW1fdG90YWxfY29u
bmVjdGlvbnMgPT0gMCAmJiAhIHByaXYtPmZpbmlzaGVkKSB7DQogCQlwcml2LT5maW5pc2hlZCA9
IFRSVUU7DQogCQlnX3NpZ25hbF9lbWl0IChvZmZsaW5lX2hhbmRsZXIsIHNpZ25hbHNbT0ZGTElO
RV9QUk9DRURVUkVfRklOSVNIRURdLCAwLCBUUlVFKTsNCkBAIC01NDMsMTI4ICs1MzcsNiBAQCB1
cGRhdGVfZGlhbG9nX3RyZWVfdmlld19oYXNoX2ZvcmVhY2ggKHZvDQogCX0NCiB9DQogDQotc3Rh
dGljIHZvaWQNCi11cGRhdGVfZGlhbG9nX2NsaXN0IChFU2hlbGxPZmZsaW5lSGFuZGxlciAqb2Zm
bGluZV9oYW5kbGVyKQ0KLXsNCi0JRVNoZWxsT2ZmbGluZUhhbmRsZXJQcml2YXRlICpwcml2Ow0K
LQlHdGtXaWRnZXQgKnRyZWVfdmlldzsNCi0JR3RrTGlzdFN0b3JlICptb2RlbDsNCi0JR3RrQ2Vs
bFJlbmRlcmVyICpyZW5kZXJlcjsNCi0JR3RrVHJlZVZpZXdDb2x1bW4gKmNvbHVtbjsNCi0NCi0J
cHJpdiA9IG9mZmxpbmVfaGFuZGxlci0+cHJpdjsNCi0JaWYgKHByaXYtPmRpYWxvZ19ndWkgPT0g
TlVMTCkNCi0JCXJldHVybjsNCi0NCi0gICAgICAgIHRyZWVfdmlldyA9IGdsYWRlX3htbF9nZXRf
d2lkZ2V0IChwcml2LT5kaWFsb2dfZ3VpLCAiYWN0aXZlX2Nvbm5lY3Rpb25fdHJlZXZpZXciKTsN
Ci0JZ19hc3NlcnQgKEdUS19JU19UUkVFX1ZJRVcgKHRyZWVfdmlldykpOw0KLQ0KLQlndGtfdHJl
ZV92aWV3X3NldF9oZWFkZXJzX3Zpc2libGUgKEdUS19UUkVFX1ZJRVcgKHRyZWVfdmlldyksIEZB
TFNFKTsNCi0NCi0JcmVuZGVyZXIgPSBndGtfY2VsbF9yZW5kZXJlcl90ZXh0X25ldyAoKTsNCi0J
Y29sdW1uID0gZ3RrX3RyZWVfdmlld19jb2x1bW5fbmV3X3dpdGhfYXR0cmlidXRlcyAoIkhvc3Qi
LCByZW5kZXJlciwgInRleHQiLCAwLCBOVUxMKTsNCi0JZ3RrX3RyZWVfdmlld19hcHBlbmRfY29s
dW1uIChHVEtfVFJFRV9WSUVXICh0cmVlX3ZpZXcpLCBjb2x1bW4pOw0KLQ0KLQltb2RlbCA9IGd0
a19saXN0X3N0b3JlX25ldyAoMSwgR19UWVBFX1NUUklORyk7DQotCWdfaGFzaF90YWJsZV9mb3Jl
YWNoIChwcml2LT5pZF90b19jb21wb25lbnRfaW5mbywgdXBkYXRlX2RpYWxvZ190cmVlX3ZpZXdf
aGFzaF9mb3JlYWNoLCBtb2RlbCk7DQotDQotCWd0a190cmVlX3ZpZXdfc2V0X21vZGVsIChHVEtf
VFJFRV9WSUVXICh0cmVlX3ZpZXcpLCBHVEtfVFJFRV9NT0RFTChtb2RlbCkpOw0KLX0NCi0NCi1z
dGF0aWMgdm9pZA0KLWRpYWxvZ19oYW5kbGVfb2sgKEd0a0RpYWxvZyAqZGlhbG9nLA0KLQkJICBF
U2hlbGxPZmZsaW5lSGFuZGxlciAqb2ZmbGluZV9oYW5kbGVyKQ0KLXsNCi0JRVNoZWxsT2ZmbGlu
ZUhhbmRsZXJQcml2YXRlICpwcml2Ow0KLQlHdGtXaWRnZXQgKmluc3RydWN0aW9uX2xhYmVsOw0K
LQ0KLQlwcml2ID0gb2ZmbGluZV9oYW5kbGVyLT5wcml2Ow0KLQ0KLQlndGtfZGlhbG9nX3NldF9y
ZXNwb25zZV9zZW5zaXRpdmUgKGRpYWxvZywgR1RLX1JFU1BPTlNFX09LLCBGQUxTRSk7DQotDQot
CWluc3RydWN0aW9uX2xhYmVsID0gZ2xhZGVfeG1sX2dldF93aWRnZXQgKHByaXYtPmRpYWxvZ19n
dWksICJpbnN0cnVjdGlvbl9sYWJlbCIpOw0KLQlnX2Fzc2VydCAoaW5zdHJ1Y3Rpb25fbGFiZWwg
IT0gTlVMTCk7DQotCWdfYXNzZXJ0IChHVEtfSVNfTEFCRUwgKGluc3RydWN0aW9uX2xhYmVsKSk7
DQotDQotCWd0a19sYWJlbF9zZXRfdGV4dCAoR1RLX0xBQkVMIChpbnN0cnVjdGlvbl9sYWJlbCks
IF8oIkNsb3NpbmcgY29ubmVjdGlvbnMuLi4iKSk7DQotDQotCWZpbmFsaXplX29mZmxpbmUgKG9m
ZmxpbmVfaGFuZGxlcik7DQotfQ0KLQ0KLXN0YXRpYyB2b2lkDQotZGlhbG9nX2hhbmRsZV9jYW5j
ZWwgKEd0a0RpYWxvZyAqZGlhbG9nLA0KLQkJICAgICAgRVNoZWxsT2ZmbGluZUhhbmRsZXIgKm9m
ZmxpbmVfaGFuZGxlcikNCi17DQotCUVTaGVsbE9mZmxpbmVIYW5kbGVyUHJpdmF0ZSAqcHJpdjsN
Ci0NCi0JcHJpdiA9IG9mZmxpbmVfaGFuZGxlci0+cHJpdjsNCi0NCi0JZ3RrX3dpZGdldF9kZXN0
cm95IChHVEtfV0lER0VUIChkaWFsb2cpKTsNCi0NCi0JZ19vYmplY3RfdW5yZWYgKHByaXYtPmRp
YWxvZ19ndWkpOw0KLQlwcml2LT5kaWFsb2dfZ3VpID0gTlVMTDsNCi0NCi0JY2FuY2VsX29mZmxp
bmUgKG9mZmxpbmVfaGFuZGxlcik7DQotfQ0KLQ0KLXN0YXRpYyB2b2lkDQotZGlhbG9nX3Jlc3Bv
bnNlX2NiIChHdGtEaWFsb2cgKmRpYWxvZywNCi0JCSAgICBpbnQgcmVzcG9uc2VfaWQsDQotCQkg
ICAgdm9pZCAqZGF0YSkNCi17DQotCUVTaGVsbE9mZmxpbmVIYW5kbGVyICpvZmZsaW5lX2hhbmRs
ZXI7DQotDQotCW9mZmxpbmVfaGFuZGxlciA9IEVfU0hFTExfT0ZGTElORV9IQU5ETEVSIChkYXRh
KTsNCi0NCi0Jc3dpdGNoIChyZXNwb25zZV9pZCkgew0KLQljYXNlIEdUS19SRVNQT05TRV9PSzoN
Ci0JCWRpYWxvZ19oYW5kbGVfb2sgKGRpYWxvZywgb2ZmbGluZV9oYW5kbGVyKTsNCi0JCWJyZWFr
Ow0KLQ0KLQljYXNlIEdUS19SRVNQT05TRV9DQU5DRUw6DQotCWNhc2UgR1RLX1JFU1BPTlNFX0RF
TEVURV9FVkVOVDoNCi0JCWRpYWxvZ19oYW5kbGVfY2FuY2VsIChkaWFsb2csIG9mZmxpbmVfaGFu
ZGxlcik7DQotCQlicmVhazsNCi0NCi0JZGVmYXVsdDoNCi0JCWdfYXNzZXJ0X25vdF9yZWFjaGVk
ICgpOw0KLQl9DQotfQ0KLQ0KLXN0YXRpYyB2b2lkDQotcG9wX3VwX2NvbmZpcm1hdGlvbl9kaWFs
b2cgKEVTaGVsbE9mZmxpbmVIYW5kbGVyICpvZmZsaW5lX2hhbmRsZXIpDQotew0KLQlFU2hlbGxP
ZmZsaW5lSGFuZGxlclByaXZhdGUgKnByaXY7DQotCUd0a1dpZGdldCAqZGlhbG9nOw0KLQ0KLQlw
cml2ID0gb2ZmbGluZV9oYW5kbGVyLT5wcml2Ow0KLQ0KLQlpZiAocHJpdi0+ZGlhbG9nX2d1aSA9
PSBOVUxMKSB7DQotCQlwcml2LT5kaWFsb2dfZ3VpID0gZ2xhZGVfeG1sX25ldyAoR0xBREVfRElB
TE9HX0ZJTEVfTkFNRSwgTlVMTCwgTlVMTCk7DQotCQlpZiAocHJpdi0+ZGlhbG9nX2d1aSA9PSBO
VUxMKSB7DQotCQkJZ193YXJuaW5nICgiQ2Fubm90IGxvYWQgdGhlIGFjdGl2ZSBjb25uZWN0aW9u
IGRpYWxvZyAoaW5zdGFsbGF0aW9uIHByb2JsZW0/KSAtLSAlcyIsDQotCQkJCSAgIEdMQURFX0RJ
QUxPR19GSUxFX05BTUUpOw0KLQkJCWZpbmFsaXplX29mZmxpbmUgKG9mZmxpbmVfaGFuZGxlcik7
DQotCQkJcmV0dXJuOw0KLQkJfQ0KLQl9DQotDQotCWRpYWxvZyA9IGdsYWRlX3htbF9nZXRfd2lk
Z2V0IChwcml2LT5kaWFsb2dfZ3VpLCAiYWN0aXZlX2Nvbm5lY3Rpb25fZGlhbG9nIik7DQotCWd0
a19jb250YWluZXJfc2V0X2JvcmRlcl93aWR0aCAoR1RLX0NPTlRBSU5FUiAoR1RLX0RJQUxPRyAo
ZGlhbG9nKS0+dmJveCksIDApOw0KLQlndGtfY29udGFpbmVyX3NldF9ib3JkZXJfd2lkdGggKEdU
S19DT05UQUlORVIgKEdUS19ESUFMT0cgKGRpYWxvZyktPmFjdGlvbl9hcmVhKSwgMTIpOw0KLQ0K
LQkvKiBGSVhNRTogZG8gd2UgcmVhbGx5IHdhbnQgdGhpcz8gICovDQotCS8qIGd0a193aW5kb3df
c2V0X3RyYW5zaWVudF9mb3IgKEdUS19XSU5ET1cgKGRpYWxvZyksIEdUS19XSU5ET1cgKHByaXYt
PnBhcmVudF9zaGVsbF92aWV3KSk7ICovDQotCS8qIGd0a193aW5kb3dfc2V0X21vZGFsIChHVEtf
V0lORE9XIChkaWFsb2cpLCBUUlVFKTsgKi8NCi0NCi0JdXBkYXRlX2RpYWxvZ19jbGlzdCAob2Zm
bGluZV9oYW5kbGVyKTsNCi0NCi0JZ19zaWduYWxfY29ubmVjdCAoZGlhbG9nLCAicmVzcG9uc2Ui
LCBHX0NBTExCQUNLIChkaWFsb2dfcmVzcG9uc2VfY2IpLCBvZmZsaW5lX2hhbmRsZXIpOw0KLQ0K
LQlndGtfd2lkZ2V0X3Nob3cgKGRpYWxvZyk7DQotfQ0KLQ0KLQ0KIC8qIEdPYmplY3QgbWV0aG9k
cy4gICovDQogDQogc3RhdGljIHZvaWQNCkBAIC02ODQsMTYgKzU1Niw2IEBAIGltcGxfZGlzcG9z
ZSAoR09iamVjdCAqb2JqZWN0KQ0KIAkJcHJpdi0+aWRfdG9fY29tcG9uZW50X2luZm8gPSBOVUxM
Ow0KIAl9DQogDQotCWlmIChwcml2LT5kaWFsb2dfZ3VpICE9IE5VTEwpIHsNCi0JCUd0a1dpZGdl
dCAqZGlhbG9nOw0KLQ0KLQkJZGlhbG9nID0gZ2xhZGVfeG1sX2dldF93aWRnZXQgKHByaXYtPmRp
YWxvZ19ndWksICJhY3RpdmVfY29ubmVjdGlvbl9kaWFsb2ciKTsNCi0JCWd0a193aWRnZXRfZGVz
dHJveSAoZGlhbG9nKTsNCi0NCi0JCWdfb2JqZWN0X3VucmVmIChwcml2LT5kaWFsb2dfZ3VpKTsN
Ci0JCXByaXYtPmRpYWxvZ19ndWkgPSBOVUxMOw0KLQl9DQotDQogCSgqIEdfT0JKRUNUX0NMQVNT
IChlX3NoZWxsX29mZmxpbmVfaGFuZGxlcl9wYXJlbnRfY2xhc3MpLT5kaXNwb3NlKSAob2JqZWN0
KTsNCiB9DQogDQpAQCAtNzUyLDkgKzYxNCw2IEBAIGVfc2hlbGxfb2ZmbGluZV9oYW5kbGVyX2lu
aXQgKEVTaGVsbE9mZmwNCiAJcHJpdiA9IGdfbmV3IChFU2hlbGxPZmZsaW5lSGFuZGxlclByaXZh
dGUsIDEpOw0KIA0KIAlwcml2LT5zaGVsbCAgICAgICAgICAgICAgICAgPSBOVUxMOw0KLQlwcml2
LT5wYXJlbnRfd2luZG93ICAgICAgICAgPSBOVUxMOw0KLQ0KLQlwcml2LT5kaWFsb2dfZ3VpICAg
ICAgICAgICAgPSBOVUxMOw0KIA0KIAlwcml2LT5udW1fdG90YWxfY29ubmVjdGlvbnMgPSAwOw0K
IAlwcml2LT5pZF90b19jb21wb25lbnRfaW5mbyAgPSBnX2hhc2hfdGFibGVfbmV3IChnX3N0cl9o
YXNoLCBnX3N0cl9lcXVhbCk7DQpAQCAtODI3LDEyICs2ODYsMTAgQEAgZV9zaGVsbF9vZmZsaW5l
X2hhbmRsZXJfcHV0X2NvbXBvbmVudHNfbw0KIA0KIAlnX3JldHVybl9pZl9mYWlsIChvZmZsaW5l
X2hhbmRsZXIgIT0gTlVMTCk7DQogCWdfcmV0dXJuX2lmX2ZhaWwgKEVfSVNfU0hFTExfT0ZGTElO
RV9IQU5ETEVSIChvZmZsaW5lX2hhbmRsZXIpKTsNCi0JZ19yZXR1cm5faWZfZmFpbCAocGFyZW50
X3dpbmRvdyA9PSBOVUxMIHx8IEdUS19JU19XSU5ET1cgKHBhcmVudF93aW5kb3cpKTsNCiANCiAJ
cHJpdiA9IG9mZmxpbmVfaGFuZGxlci0+cHJpdjsNCiANCiAJcHJpdi0+cHJvY2VkdXJlX2luX3By
b2dyZXNzID0gVFJVRTsNCi0JcHJpdi0+cGFyZW50X3dpbmRvdyA9IHBhcmVudF93aW5kb3c7DQog
DQogCS8qIEFkZCBhbiBleHRyYSByZWYgaGVyZSBhcyB0aGUgc2lnbmFsIGhhbmRsZXJzIG1pZ2h0
IHdhbnQgdG8gdW5yZWYNCiAJICAgdXMuICAqLw0KQEAgLTg1Miw5ICs3MDksNiBAQCBlX3NoZWxs
X29mZmxpbmVfaGFuZGxlcl9wdXRfY29tcG9uZW50c19vDQogCQlyZXR1cm47DQogCX0NCiANCi0J
aWYgKHByaXYtPm51bV90b3RhbF9jb25uZWN0aW9ucyA+IDAgJiYgcHJpdi0+cGFyZW50X3dpbmRv
dyAhPSBOVUxMKQ0KLQkJcG9wX3VwX2NvbmZpcm1hdGlvbl9kaWFsb2cgKG9mZmxpbmVfaGFuZGxl
cik7DQotCWVsc2UNCiAJCWZpbmFsaXplX29mZmxpbmUgKG9mZmxpbmVfaGFuZGxlcik7DQogDQog
CWdfb2JqZWN0X3VucmVmIChvZmZsaW5lX2hhbmRsZXIpOw0K


--=-TBsyGEzjIcJchM12R2hr--