Mercurial > pidgin
diff libpurple/purple-url-handler @ 31389:380314aa5c1b
Fix some issues with purple-url-handler.
The findaccount function was failing because the call to
cpurple.PurpleAccountGetProtocolId used the wrong case for the
function name. The IRC handler could also incorrectly called
unquote_plus with a None value. I didn't really check the rest of the
IRC handler, though. It might be broken in other ways.
Reported by PotterT|VF in the IRC channel.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Wed, 16 Mar 2011 04:59:16 +0000 |
parents | adef21420870 |
children |
line wrap: on
line diff
--- a/libpurple/purple-url-handler Wed Mar 16 01:46:12 2011 +0000 +++ b/libpurple/purple-url-handler Wed Mar 16 04:59:16 2011 +0000 @@ -73,7 +73,7 @@ def findaccount(protocolname, accountname="", matcher=None): if matcher: for account in cpurple.PurpleAccountsGetAll(): - if (protocolname != cpurple.PurpleAccountGetProtocolID(account)) or \ + if (protocolname != cpurple.PurpleAccountGetProtocolId(account)) or \ (accountname != "" and accountname != cpurple.PurpleAccountGetUsername(account)): continue if matcher(account): @@ -188,7 +188,7 @@ print "Invalid irc URI: %s" % uri return - server = urllib.unquote_plus(match.group(2)) or "" + server = urllib.unquote_plus(match.group(2) or "") target = match.group(3) or "" query = match.group(5) or ""