[network/kio-extras] kcms/trash: kcmtrash.cpp: fix trash settings not detecting multiple mounts
Antti Savolainen <[email protected]> Wed, 5 Aug 2026 00:10:12 +0000 (UTC)
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
R2l0IGNvbW1pdCBiZTc3ZjUxYmZiMmZmYzlhNWJjNjY5M2YyNWM1NWU1Yjg0NWJiNWVkIGJ5IEFu dHRpIFNhdm9sYWluZW4uCkNvbW1pdHRlZCBvbiAwNS8wOC8yMDI2IGF0IDAwOjAxLgpQdXNoZWQg YnkgYXNhdm9sYWluZW4gaW50byBicmFuY2ggJ21hc3RlcicuCgprY210cmFzaC5jcHA6IGZpeCB0 cmFzaCBzZXR0aW5ncyBub3QgZGV0ZWN0aW5nIG11bHRpcGxlIG1vdW50cwoKQlVHOiA0Njk1OTgK Ck0gICsyICAgIC0yICAgIGtjbXMvdHJhc2gva2NtdHJhc2guY3BwCk0gICsxICAgIC0xICAgIGtj bXMvdHJhc2gva2NtdHJhc2guaAoKaHR0cHM6Ly9pbnZlbnQua2RlLm9yZy9uZXR3b3JrL2tpby1l eHRyYXMvLS9jb21taXQvYmU3N2Y1MWJmYjJmZmM5YTViYzY2OTNmMjVjNTVlNWI4NDViYjVlZAoK ZGlmZiAtLWdpdCBhL2tjbXMvdHJhc2gva2NtdHJhc2guY3BwIGIva2Ntcy90cmFzaC9rY210cmFz aC5jcHAKaW5kZXggOWM4ZGJiNTlhLi5lZWI5OGI1NzIgMTAwNjQ0Ci0tLSBhL2tjbXMvdHJhc2gv a2NtdHJhc2guY3BwCisrKyBiL2tjbXMvdHJhc2gva2NtdHJhc2guY3BwCkBAIC00Nyw3ICs0Nyw3 IEBAIFRyYXNoQ29uZmlnTW9kdWxlOjpUcmFzaENvbmZpZ01vZHVsZShRT2JqZWN0ICpwYXJlbnQs IGNvbnN0IEtQbHVnaW5NZXRhRGF0YSAmZGF0CiAgICAgICAgIGF1dG8gZG9jID0gUUpzb25Eb2N1 bWVudDo6ZnJvbUpzb24oam9iLT5tZXRhRGF0YSgpLnZhbHVlKFFTdHJpbmdMaXRlcmFsKCJUUkFT SF9ESVJFQ1RPUklFUyIpKS50b0xvY2FsOEJpdCgpKTsKICAgICAgICAgY29uc3QgYXV0byBtYXAg PSBkb2Mub2JqZWN0KCkudG9WYXJpYW50TWFwKCk7CiAgICAgICAgIGZvciAoYXV0byBpdCA9IG1h cC5iZWdpbigpOyBpdCAhPSBtYXAuZW5kKCk7IGl0KyspIHsKLSAgICAgICAgICAgIG1fdHJhc2hN YXAuaW5zZXJ0KGl0LmtleSgpLnRvSW50KCksIGl0LnZhbHVlKCkudG9TdHJpbmcoKSk7CisgICAg ICAgICAgICBtX3RyYXNoTWFwLmluc2VydChpdC5rZXkoKS50b1VJbnQoKSwgaXQudmFsdWUoKS50 b1N0cmluZygpKTsKICAgICAgICAgfQogICAgICAgICBzZXR1cEd1aSgpOwogICAgICAgICB0cmFz aENoYW5nZWQoMCk7CkBAIC0yMTcsNyArMjE3LDcgQEAgdm9pZCBUcmFzaENvbmZpZ01vZHVsZTo6 c2V0dXBHdWkoKQogICAgICAgICBRTGlzdFdpZGdldCAqbW91bnRQb2ludHMgPSBuZXcgUUxpc3RX aWRnZXQod2lkZ2V0KCkpOwogICAgICAgICBsYXlvdXQtPmFkZFdpZGdldChtb3VudFBvaW50cyk7 CiAKLSAgICAgICAgUU1hcEl0ZXJhdG9yPGludCwgUVN0cmluZz4gaXQobV90cmFzaE1hcCk7Cisg ICAgICAgIFFNYXBJdGVyYXRvcjx1aW50LCBRU3RyaW5nPiBpdChtX3RyYXNoTWFwKTsKICAgICAg ICAgd2hpbGUgKGl0Lmhhc05leHQoKSkgewogICAgICAgICAgICAgaXQubmV4dCgpOwogCmRpZmYg LS1naXQgYS9rY21zL3RyYXNoL2tjbXRyYXNoLmggYi9rY21zL3RyYXNoL2tjbXRyYXNoLmgKaW5k ZXggMTdjOTU3ODQyLi4xMzI4N2QzZTIgMTAwNjQ0Ci0tLSBhL2tjbXMvdHJhc2gva2NtdHJhc2gu aAorKysgYi9rY21zL3RyYXNoL2tjbXRyYXNoLmgKQEAgLTYxLDcgKzYxLDcgQEAgcHJpdmF0ZToK IAogICAgIHR5cGVkZWYgUU1hcDxRU3RyaW5nLCBDb25maWdFbnRyeT4gQ29uZmlnTWFwOwogICAg IENvbmZpZ01hcCBtQ29uZmlnTWFwOwotICAgIFFNYXA8aW50LCBRU3RyaW5nPiBtX3RyYXNoTWFw OworICAgIFFNYXA8dWludCwgUVN0cmluZz4gbV90cmFzaE1hcDsKIH07CiAKICNlbmRpZiAvLyBL Q01UUkFTSF9ICg==