Re: yet another gnome-vfs patch

This is a multi-part message in MIME format.

--Multipart_Wed__28_Aug_2002_10:29:19_+0200_0837fa20
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Err, I attached the wrong patch in the previous mail :)



On Wed, 28 Aug 2002 10:08:09 +0200
Christophe Fergeau <[email protected]> wrote:

> 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:29:19_+0200_0837fa20
Content-Type: text/plain;
 name="login.diff"
Content-Disposition: attachment;
 filename="login.diff"
Content-Transfer-Encoding: base64

ZGlmZiAtdXIgZ25vbWUtdmZzL21vZHVsZXMvZnRwLW1ldGhvZC5jIGdub21lLXZmcy1uZXcvbW9k
dWxlcy9mdHAtbWV0aG9kLmMKLS0tIGdub21lLXZmcy9tb2R1bGVzL2Z0cC1tZXRob2QuYwkyMDAy
LTA1LTA4IDIxOjA0OjUxLjAwMDAwMDAwMCArMDIwMAorKysgZ25vbWUtdmZzLW5ldy9tb2R1bGVz
L2Z0cC1tZXRob2QuYwkyMDAyLTA4LTI3IDIyOjMwOjU5LjAwMDAwMDAwMCArMDIwMApAQCAtNDIs
MTUgKzQyLDE4IEBACiAjaW5jbHVkZSA8bmV0aW5ldC9pbi5oPgogCiAjaW5jbHVkZSA8YXJwYS9p
bmV0Lmg+CisKICNpbmNsdWRlIDxsaWJnbm9tZXZmcy9nbm9tZS12ZnMtY29udGV4dC5oPgogI2lu
Y2x1ZGUgPGxpYmdub21ldmZzL2dub21lLXZmcy1pbmV0LWNvbm5lY3Rpb24uaD4KICNpbmNsdWRl
IDxsaWJnbm9tZXZmcy9nbm9tZS12ZnMtaW9idWYuaD4KICNpbmNsdWRlIDxsaWJnbm9tZXZmcy9n
bm9tZS12ZnMtbWV0aG9kLmg+CiAjaW5jbHVkZSA8bGliZ25vbWV2ZnMvZ25vbWUtdmZzLW1pbWUu
aD4KICNpbmNsdWRlIDxsaWJnbm9tZXZmcy9nbm9tZS12ZnMtbWltZS11dGlscy5oPgotI2luY2x1
ZGUgPGxpYmdub21ldmZzL2dub21lLXZmcy1tb2R1bGUtc2hhcmVkLmg+CiAjaW5jbHVkZSA8bGli
Z25vbWV2ZnMvZ25vbWUtdmZzLW1vZHVsZS5oPgorI2luY2x1ZGUgPGxpYmdub21ldmZzL2dub21l
LXZmcy1tb2R1bGUtY2FsbGJhY2stbW9kdWxlLWFwaS5oPgorI2luY2x1ZGUgPGxpYmdub21ldmZz
L2dub21lLXZmcy1tb2R1bGUtc2hhcmVkLmg+CiAjaW5jbHVkZSA8bGliZ25vbWV2ZnMvZ25vbWUt
dmZzLXBhcnNlLWxzLmg+CisjaW5jbHVkZSA8bGliZ25vbWV2ZnMvZ25vbWUtdmZzLXN0YW5kYXJk
LWNhbGxiYWNrcy5oPgogI2luY2x1ZGUgPGxpYmdub21ldmZzL2dub21lLXZmcy11dGlscy5oPgog
I2luY2x1ZGUgPHN0ZGlvLmg+IC8qIGZvciBzc2NhbmYgKi8KICNpbmNsdWRlIDxzdGRsaWIuaD4g
LyogZm9yIGF0b2kgKi8KQEAgLTUwNCwxMiArNTA3LDU3IEBACiAKIH0KIAorCitzdGF0aWMgR25v
bWVWRlNSZXN1bHQgZnRwX2xvZ2luKEZ0cENvbm5lY3Rpb24gKmNvbm4sIAorICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICp1c2VyLCBjb25zdCBjaGFyICpwYXNzd29y
ZCkKK3sKKwlnY2hhciAqdG1wc3RyaW5nOworCUdub21lVkZTUmVzdWx0IHJlc3VsdDsKKwlzdGF0
aWMgZ2Jvb2xlYW4gZmlyc3RfbG9naW5fYXR0ZW1wdCA9IFRSVUU7CisJCisJdG1wc3RyaW5nID0g
Z19zdHJkdXBfcHJpbnRmICgiVVNFUiAlcyIsIHVzZXIpOworCXJlc3VsdCA9IGRvX2Jhc2ljX2Nv
bW1hbmQgKGNvbm4sIHRtcHN0cmluZyk7CisJZ19mcmVlICh0bXBzdHJpbmcpOworCisJaWYgKElT
XzMwMCAoY29ubi0+cmVzcG9uc2VfY29kZSkpIHsKKwkJdG1wc3RyaW5nID0gZ19zdHJkdXBfcHJp
bnRmICgiUEFTUyAlcyIsIHBhc3N3b3JkKTsKKwkJcmVzdWx0ID0gZG9fYmFzaWNfY29tbWFuZCAo
Y29ubiwgdG1wc3RyaW5nKTsKKwkJZ19mcmVlICh0bXBzdHJpbmcpOworCX0KKwkKKwlpZiAoKHJl
c3VsdCAhPSBHTk9NRV9WRlNfT0spICYmIChmaXJzdF9sb2dpbl9hdHRlbXB0KSkgeworCQlHbm9t
ZVZGU01vZHVsZUNhbGxiYWNrQXV0aGVudGljYXRpb25JbiBpbjsKKwkJR25vbWVWRlNNb2R1bGVD
YWxsYmFja0F1dGhlbnRpY2F0aW9uT3V0IG91dDsKKwkJZ2Jvb2xlYW4gY2FsbGJhY2tfY2FsbGVk
OworCisJCWluLnVyaSA9IGdub21lX3Zmc191cmlfdG9fc3RyaW5nKGNvbm4tPnVyaSwgRkFMU0Up
OworCQlpbi5yZWFsbSA9IE5VTEw7CisJCWluLnByZXZpb3VzX2F0dGVtcHRfZmFpbGVkID0gVFJV
RTsKKwkJaW4uYXV0aF90eXBlID0gQXV0aFR5cGVCYXNpYzsKKworCQljYWxsYmFja19jYWxsZWQg
PSBnbm9tZV92ZnNfbW9kdWxlX2NhbGxiYWNrX2ludm9rZShHTk9NRV9WRlNfTU9EVUxFX0NBTExC
QUNLX0FVVEhFTlRJQ0FUSU9OLCAKKwkJCQkJICZpbiwKKwkJCQkJIHNpemVvZihHbm9tZVZGU01v
ZHVsZUNhbGxiYWNrQXV0aGVudGljYXRpb25JbiksCisJCQkJCSAmb3V0LAorCQkJCQkgc2l6ZW9m
KEdub21lVkZTTW9kdWxlQ2FsbGJhY2tBdXRoZW50aWNhdGlvbk91dCkpOworCQlpZiAoY2FsbGJh
Y2tfY2FsbGVkKSB7CisJCQlmaXJzdF9sb2dpbl9hdHRlbXB0ID0gRkFMU0U7CisJCSAJcmVzdWx0
ID0gZnRwX2xvZ2luKGNvbm4sIG91dC51c2VybmFtZSwgb3V0LnBhc3N3b3JkKTsKKwkJCWdfZnJl
ZShvdXQudXNlcm5hbWUpOworCQkJZ19mcmVlKG91dC5wYXNzd29yZCk7CisJCX0KKwl9CisKKwlm
aXJzdF9sb2dpbl9hdHRlbXB0ID0gVFJVRTsKKwlyZXR1cm4gcmVzdWx0OworfQorCisKIHN0YXRp
YyBHbm9tZVZGU1Jlc3VsdCAKIGZ0cF9jb25uZWN0aW9uX2NyZWF0ZSAoRnRwQ29ubmVjdGlvbiAq
KmNvbm5wdHIsIEdub21lVkZTVVJJICp1cmksIEdub21lVkZTQ29udGV4dCAqY29udGV4dCkgCiB7
CiAJRnRwQ29ubmVjdGlvbiAqY29ubiA9IGdfbmV3MCAoRnRwQ29ubmVjdGlvbiwgMSk7CiAJR25v
bWVWRlNSZXN1bHQgcmVzdWx0OwotCWdjaGFyICp0bXBzdHJpbmc7CiAJZ2ludCBwb3J0ID0gY29u
dHJvbF9wb3J0OwogCWNvbnN0IGdjaGFyICp1c2VyID0gYW5vbl91c2VyOwogCWNvbnN0IGdjaGFy
ICpwYXNzID0gYW5vbl9wYXNzOwpAQCAtNTczLDE2ICs2MjEsOCBAQAogCQlyZXR1cm4gcmVzdWx0
OwogCX0KIAotCXRtcHN0cmluZyA9IGdfc3RyZHVwX3ByaW50ZiAoIlVTRVIgJXMiLCB1c2VyKTsK
LQlyZXN1bHQgPSBkb19iYXNpY19jb21tYW5kIChjb25uLCB0bXBzdHJpbmcpOwotCWdfZnJlZSAo
dG1wc3RyaW5nKTsKLQotCWlmIChJU18zMDAgKGNvbm4tPnJlc3BvbnNlX2NvZGUpKSB7Ci0JCXRt
cHN0cmluZyA9IGdfc3RyZHVwX3ByaW50ZiAoIlBBU1MgJXMiLCBwYXNzKTsKLQkJcmVzdWx0ID0g
ZG9fYmFzaWNfY29tbWFuZCAoY29ubiwgdG1wc3RyaW5nKTsKLQkJZ19mcmVlICh0bXBzdHJpbmcp
OwotCX0KLQorCXJlc3VsdCA9IGZ0cF9sb2dpbihjb25uLCB1c2VyLCBwYXNzKTsKKwkKIAlpZiAo
cmVzdWx0ICE9IEdOT01FX1ZGU19PSykgewogCQkvKiBsb2dpbiBmYWlsZWQgKi8KIAkJZ193YXJu
aW5nICgiRlRQIHNlcnZlciBzYWlkOiBcIiVkICVzXCJcbiIsIGNvbm4tPnJlc3BvbnNlX2NvZGUs
Cg==

--Multipart_Wed__28_Aug_2002_10:29:19_+0200_0837fa20--