yet another gnome-vfs patch
Christophe Fergeau <[email protected]> Wed, 28 Aug 2002 10:08:09 +0200
| Newsgroups | gmane.comp.gnome.vfs |
|---|---|
| Organization | Mipsys |
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. --Multipart_Wed__28_Aug_2002_10:08:09_+0200_082ebfb8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit I still don't know if/where my patches will go, but that doesn't prevent me from trying to improve gnome-vfs and nautilus remote file browsing. Today's patch is for the ftp method. It invokes the "simple-authentification" callback when it failed to login using the provided username/password. That way, if login failed, nautilus asks for a valid username/password. This patch is not perfect since the uri isn't modified to take into account the username/password the user entered because I don't know if I'm allowed to modify the uri provided by the user from a gnome-vfs module. Christophe --Multipart_Wed__28_Aug_2002_10:08:09_+0200_082ebfb8 Content-Type: text/plain; name="modules.diff" Content-Disposition: attachment; filename="modules.diff" Content-Transfer-Encoding: base64 PyBnbm9tZS12ZnMuZGlmZgo/IG1vZHVsZXMuZGlmZgo/IG1vZHVsZXMvdmZvbGRlcgpJbmRleDog Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvZ25vbWUvZ25vbWUtdmZzL0NoYW5n ZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMzM0LjIuNDAKZGlmZiAtdSAtcjEuMTMzNC4y LjQwIENoYW5nZUxvZwotLS0gQ2hhbmdlTG9nCTIzIEF1ZyAyMDAyIDIxOjQ4OjU2IC0wMDAwCTEu MTMzNC4yLjQwCisrKyBDaGFuZ2VMb2cJMjcgQXVnIDIwMDIgMDg6MTY6NDkgLTAwMDAKQEAgLTEs MyArMSwxMyBAQAorMjAwMi0wOC0yNiAgQ2hyaXN0b3BoZSBGZXJnZWF1ICA8dGV1ZkB1c2Vycy5z b3VyY2Vmb3JnZS5uZXQ+CisJKiBtb2R1bGVzL3NzaC1tZXRob2QuYzogCisJTWFrZSBkb19yZWFk IHJldHVybiBHTk9NRV9WRlNfRVJST1JfRU9GIHdoZW4gaXQgcmVhZCAwIGJ5dGUKKwlGb3JjZSBD IGxvY2FsZSBpbiBzc2hfY29ubmVjdCBiZWZvcmUgcnVubmluZyBzc2ggKHRoZSBscyBwYXJzaW5n IAorCWZ1bmN0aW9uIGV4cGVjdHMgbHMgb3V0cHV0IHRvIGJlIGluIHRoaXMgbG9jYWxlKQorCVdo ZW4gdGhlIHVyaSBjb250YWlucyBubyB1c2VybmFtZSwgdXNlIHRoZSBuYW1lIG9mIHRoZSBjdXJy ZW50IHVzZXIKKwkob3RoZXJ3aXNlIHNzaDovL2xvY2FsaG9zdCB3b24ndCB3b3JrKS4KKwkqIG1v ZHVsZXMvZnRwLW1ldGhvZC5jOgorCU1ha2UgZG9fcmVhZCByZXR1cm4gR05PTUVfVkZTX0VSUk9S X0VPRiB3aGVuIGl0IHJlYWQgMCBieXRlCisKID09PSBtZXJnZSBpbiBjaGFuZ2VzIGZyb20gZ25v bWUtdmZzLTItMC12Zm9sZGVyLXJld3JpdGUgYnJhbmNoID09PQogCiAyMDAyLTA4LTIzICBBbGV4 IEdyYXZlbGV5ICA8YWxleEB4aW1pYW4uY29tPgpJbmRleDogbW9kdWxlcy9mdHAtbWV0aG9kLmMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9nbm9tZS9nbm9tZS12ZnMvbW9kdWxlcy9mdHAtbWV0 aG9kLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuODcKZGlmZiAtdSAtcjEuODcgZnRwLW1ldGhv ZC5jCi0tLSBtb2R1bGVzL2Z0cC1tZXRob2QuYwk4IE1heSAyMDAyIDE5OjA0OjUxIC0wMDAwCTEu ODcKKysrIG1vZHVsZXMvZnRwLW1ldGhvZC5jCTI3IEF1ZyAyMDAyIDA4OjE2OjUwIC0wMDAwCkBA IC04NjAsNyArODYwLDcgQEAKIAkgR25vbWVWRlNDb250ZXh0ICpjb250ZXh0KSAKIHsKIAlGdHBD b25uZWN0aW9uICpjb25uID0gKEZ0cENvbm5lY3Rpb24gKiApbWV0aG9kX2hhbmRsZTsKLQorCUdu b21lVkZTUmVzdWx0IHJlc3VsdDsKICNpZiAwCiAJLyoKIAlpZiAoY29ubi0+b3BlcmF0aW9uICE9 IEZUUF9SRUFEKSB7CkBAIC04NzAsNyArODcwLDExIEBACiAJZ19wcmludCAoImRvX3JlYWQgKCVw KVxuIiwgbWV0aG9kX2hhbmRsZSk7CiAjZW5kaWYKIAotCXJldHVybiBnbm9tZV92ZnNfaW9idWZf cmVhZCAoY29ubi0+ZGF0YV9pb2J1ZiwgYnVmZmVyLCBudW1fYnl0ZXMsIGJ5dGVzX3JlYWQpOwor CXJlc3VsdCA9IGdub21lX3Zmc19pb2J1Zl9yZWFkIChjb25uLT5kYXRhX2lvYnVmLCBidWZmZXIs IG51bV9ieXRlcywgYnl0ZXNfcmVhZCk7CisJaWYgKCpieXRlc19yZWFkID09IDApIHsKKwkJcmVz dWx0ID0gR05PTUVfVkZTX0VSUk9SX0VPRjsKKwl9CisJcmV0dXJuIHJlc3VsdDsKIH0KIAogc3Rh dGljIEdub21lVkZTUmVzdWx0IApJbmRleDogbW9kdWxlcy9zc2gtbWV0aG9kLmMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQpSQ1MgZmlsZTogL2N2cy9nbm9tZS9nbm9tZS12ZnMvbW9kdWxlcy9zc2gtbWV0aG9kLmMsdgpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuOC4yLjEKZGlmZiAtdSAtcjEuOC4yLjEgc3NoLW1ldGhvZC5j Ci0tLSBtb2R1bGVzL3NzaC1tZXRob2QuYwkxOSBKdWwgMjAwMiAwNzo1NzoxMSAtMDAwMAkxLjgu Mi4xCisrKyBtb2R1bGVzL3NzaC1tZXRob2QuYwkyNyBBdWcgMjAwMiAwODoxNjo1MCAtMDAwMApA QCAtMjEsNyArMjEsNiBAQAogICAgQXV0aG9yOiBJYW4gTWNLZWxsYXIgPHlha2tAeWFray5uZXQ+ ICovCiAKICNpbmNsdWRlIDxjb25maWcuaD4KLQogI2luY2x1ZGUgPGVycm5vLmg+CiAjaW5jbHVk ZSA8Z2xpYi9nc3RyZnVuY3MuaD4KICNpbmNsdWRlIDxsaWJnbm9tZXZmcy9nbm9tZS12ZnMtY2Fu Y2VsbGF0aW9uLmg+CkBAIC0xNTMsMTcgKzE1MiwyMCBAQAogCWNoYXIgKiogYXJndjsKIAlTc2hI YW5kbGUgKmhhbmRsZTsKIAljaGFyICpjb21tYW5kX2xpbmU7CisJY29uc3QgZ2NoYXIgKnVzZXJu YW1lOwogCWludCBhcmdjOwogCUdFcnJvciAqZ2Vycm9yID0gTlVMTDsKIAotCQorCXVzZXJuYW1l ID0gZ25vbWVfdmZzX3VyaV9nZXRfdXNlcl9uYW1lKHVyaSk7CisJaWYgKHVzZXJuYW1lID09IE5V TEwpIHsKKwkJdXNlcm5hbWUgPSBnX2dldF91c2VyX25hbWUoKTsKKwl9CiAJY29tbWFuZF9saW5l ICA9IGdfc3RyY29uY2F0ICgic3NoIC1vQmF0Y2htb2RlPXllcyAteCAtbCAiLCAKLQkJCQkgICAg IGdub21lX3Zmc191cmlfZ2V0X3VzZXJfbmFtZSAodXJpKSwKKwkJCQkgICAgIHVzZXJuYW1lLAog CQkJCSAgICAgIiAiLCBnbm9tZV92ZnNfdXJpX2dldF9ob3N0X25hbWUgKHVyaSksCi0JCQkJICAg ICAiICIsIGNvbW1hbmQsCisJCQkJICAgICAiICIsICJcIkxDX0FMTD1DOyIsIGNvbW1hbmQsIlwi IiwKIAkJCQkgICAgIE5VTEwpOwogCi0KIAlnX3NoZWxsX3BhcnNlX2FyZ3YgKGNvbW1hbmRfbGlu ZSwgJmFyZ2MsICZhcmd2LCAmZ2Vycm9yKTsKIAlnX2ZyZWUgKGNvbW1hbmRfbGluZSk7CiAJaWYg KGdlcnJvcikgewpAQCAtMzk3LDggKzM5OSwxNCBAQAogCSBHbm9tZVZGU0ZpbGVTaXplICpieXRl c19yZWFkLAogCSBHbm9tZVZGU0NvbnRleHQgKmNvbnRleHQpCiB7Ci0JcmV0dXJuIHNzaF9yZWFk ICgoU3NoSGFuZGxlICopbWV0aG9kX2hhbmRsZSwgYnVmZmVyLCBudW1fYnl0ZXMsCi0JCQlieXRl c19yZWFkKTsKKwlHbm9tZVZGU1Jlc3VsdCByZXN1bHQ7CisKKwlyZXN1bHQgPSAgc3NoX3JlYWQg KChTc2hIYW5kbGUgKiltZXRob2RfaGFuZGxlLCBidWZmZXIsIG51bV9ieXRlcywKKwkJICAJICAg IGJ5dGVzX3JlYWQpOworCWlmICgqYnl0ZXNfcmVhZCA9PSAwKSB7CQorCQlyZXN1bHQgPSBHTk9N RV9WRlNfRVJST1JfRU9GOworCX0KKwlyZXR1cm4gcmVzdWx0OwogfQogCiAvKiBhbHRlcm5hdGl2 ZSBpbXBsOgpAQCAtNDM2LDcgKzQ0NCw3IEBACiAJfSBlbHNlIHsKIAkJY21kID0gZ19zdHJkdXBf cHJpbnRmICgibHMgLWwgJy8nIik7CiAJfQotCisJCiAJcmVzdWx0ID0gc3NoX2Nvbm5lY3QgKCZo YW5kbGUsIHVyaSwgY21kKTsKIAlnX2ZyZWUgKG5hbWUpOwogCWdfZnJlZSAoY21kKTsK --Multipart_Wed__28_Aug_2002_10:08:09_+0200_082ebfb8--