pidgin: 1a46f671: Fix some issues with purple-url-handler.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 1a46f671cb5bb2bcc7280070ecad13d4ca5af5b0
Parent:   34621a972a410e8b184e161a071d3e957a57ba28
Author:   qulogic at pidgin.im
Date:     03/16/11 00:59:16
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1a46f671cb5bb2bcc7280070ecad13d4ca5af5b0

Changelog: 

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.

Changes against parent 34621a972a410e8b184e161a071d3e957a57ba28

  patched  ChangeLog
  patched  libpurple/purple-url-handler

-------------- next part --------------
============================================================
--- ChangeLog	b8dcbc56893d21a2dfa3a96b41b0be21ad1ffc08
+++ ChangeLog	f677c300947728bb314d3ad027a3bf2c8422048c
@@ -14,6 +14,7 @@ version 2.8.0 (??/??/????):
 	  #13095)
 	* Simple Silence Suppression is optional per-account. (Jakub Adam) (half
 	  of #13180)
+	* Fix purple-url-handler being unable to find an account.
 
 	Pidgin:
 	* Duplicate code cleanup.  (Gabriel Schulhof) (#10599)
============================================================
--- libpurple/purple-url-handler	b81b743f3a0fcaa9fc341d65f6698580cd00adda
+++ libpurple/purple-url-handler	b30ecfe4ad0bf82360fda6be12823d7fc342fd5f
@@ -73,7 +73,7 @@ def findaccount(protocolname, accountnam
 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 @@ def irc(uri):
         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 ""