pidgin: 972457aa: Make a hack in purple-url-handler cleane...

[resiak at pidgin.im]

-----------------------------------------------------------------
Revision: 972457aa8f4a246318025cf2c479a57e1bb70848
Ancestor: e878814dfc99f1f0a681a2263488c75a068c7c8e
Author: Johannes Buchner
Date: 2009-03-04T19:32:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/972457aa8f4a246318025cf2c479a57e1bb70848

Modified files:
        COPYRIGHT libpurple/purple-url-handler

ChangeLog: 

Make a hack in purple-url-handler cleaner.

-------------- next part --------------
============================================================
--- COPYRIGHT	4fdebaa2d83a0158ae0ae823a7f1f404f4f679cf
+++ COPYRIGHT	ee6f0afb2d091181418a75d1516b99a8f97c28c3
@@ -57,6 +57,7 @@ Norbert Buchmuller
 Philip Brown
 Dan Bruce
 Norbert Buchmuller
+Johannes Buchner
 Sean Burke
 Thomas Butter
 Trevor Caira
============================================================
--- libpurple/purple-url-handler	42f2b964ae28c613415d9b08a41d176c02ce8d0f
+++ libpurple/purple-url-handler	8a173d29d5131825346c10f64064d92f5ba21c93
@@ -207,11 +207,7 @@ def irc(uri):
 
     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)