# HG changeset patch
# User Johannes Buchner
# Date 1236195160 0
# Node ID 971b89243a20117d9d56a2ff9acd411e89a23dbe
# Parent  4d758dcd57159c9f92899563641228b04bbdf8e7
Make a hack in purple-url-handler cleaner.

committer: Will Thompson <will.thompson@collabora.co.uk>

diff -r 4d758dcd5715 -r 971b89243a20 COPYRIGHT
--- a/COPYRIGHT	Wed Mar 04 10:39:38 2009 +0000
+++ b/COPYRIGHT	Wed Mar 04 19:32:40 2009 +0000
@@ -57,6 +57,7 @@
 Philip Brown
 Dan Bruce
 Norbert Buchmuller
+Johannes Buchner
 Sean Burke
 Thomas Butter
 Trevor Caira
diff -r 4d758dcd5715 -r 971b89243a20 libpurple/purple-url-handler
--- a/libpurple/purple-url-handler	Wed Mar 04 10:39:38 2009 +0000
+++ b/libpurple/purple-url-handler	Wed Mar 04 19:32:40 2009 +0000
@@ -207,11 +207,7 @@
 
     def correct_server(account):
         username = cpurple.PurpleAccountGetUsername(account)
-        user_split = (username.split("@"))
-        # Not all accounts have a split, so append an empty string so the
-        # [1] doesn't throw an IndexError.
-        user_split.append("")
-        return (server == user_split[1])
+        return ("@" in username) and (server == (username.split("@"))[1])
 
     account = findaccount(protocol, matcher=correct_server)