diff libpurple/purple-url-handler @ 17262:8a7238fb7905

explicit merge of 'dc4f2ee34039521ae6a198fe7d62f4dca8a84589' and '9d8bc74c7c13474edcefafedd0af9020b27c9a2f'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Wed, 30 May 2007 02:56:25 +0000
parents ca69d4253246 5059a0a071a2
children fefe61275687
line wrap: on
line diff
--- a/libpurple/purple-url-handler	Wed May 23 04:18:05 2007 +0000
+++ b/libpurple/purple-url-handler	Wed May 30 02:56:25 2007 +0000
@@ -212,7 +212,7 @@
     elif command.lower() == "add":
         addbuddy(account, screenname)
 
-def myspaceim(uri):
+def myim(uri):
 	protocol = "prpl-myspace"
 	print "TODO: send uri: ", uri
 	assert False, "Not implemented"
@@ -315,7 +315,7 @@
         elif type == "msnim":
             msnim(uri)
         elif type == "myim":
-            myspaceim(uri)
+            myim(uri)
         elif type == "sip":
             sip(uri)
         elif type == "xmpp":
@@ -323,7 +323,7 @@
         elif type == "ymsgr":
             ymsgr(uri)
         else:
-            print "Unkown protocol: %s" % type
+            print "Unknown protocol: %s" % type
     except dbus.dbus_bindings.DBusException:
         print "ERROR: Is there a libpurple-powered client (e.g. Pidgin or Finch) running?"