# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1215105900 0
# Node ID 668b62240235a6404e9c661a33d7a4cc5ab96d95
# Parent  0c66344d0ed5b515c5131b3f63694061a886a1b7
Make irc:// URLs use an account on the right server, not just the first IRC
account configured.  Fixes #3915.

diff -r 0c66344d0ed5 -r 668b62240235 libpurple/purple-url-handler
--- a/libpurple/purple-url-handler	Thu Jul 03 17:19:46 2008 +0000
+++ b/libpurple/purple-url-handler	Thu Jul 03 17:25:00 2008 +0000
@@ -205,12 +205,16 @@
             key, value = extendlist(param.split("=", 1), 2, "")
             params[key] = urllib.unquote_plus(value)
 
-    account = findaccount(protocol)
+    def correct_server(account):
+        username = cpurple.PurpleAccountGetUsername(account)
+        return (server == (username.split("@"))[1])
+
+    account = findaccount(protocol, matcher=correct_server)
 
     if (target != ""):
         if (isnick):
             goim(account, urllib.unquote_plus(target.split(",")[0]), params.get("msg"))
-	else:
+        else:
             channel = urllib.unquote_plus(target.split(",")[0])
             if channel[0] != "#":
                 channel = "#" + channel