comparison libpurple/purple-remote @ 17702:3bcdb320e619

Fix http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240589 "If you run "gaim-remote aim:goim?screenname=whatever" then it throws an exception because it looks for a "prpl-oscar" account, but apparently I am signed in with a "prpl-aim" account."
author Mark Doliner <mark@kingant.net>
date Mon, 04 Jun 2007 05:56:16 +0000
parents 3c8ccbc4a667
children 6b7b13adb9b1
comparison
equal deleted inserted replaced
17701:a88796a81413 17702:3bcdb320e619
29 if result == 0: 29 if result == 0:
30 raise "Error: " + self.attr + " " + str(args) + " returned " + str(result) 30 raise "Error: " + self.attr + " " + str(args) + " returned " + str(result)
31 return result 31 return result
32 32
33 def show_help(): 33 def show_help():
34 print """This program uses DBus to communicate with purple. 34 print """This program uses D-Bus to communicate with purple.
35 35
36 Usage: 36 Usage:
37 37
38 %s "command1" "command2" ... 38 %s "command1" "command2" ...
39 39
94 def execute(uri): 94 def execute(uri):
95 match = re.match(urlregexp, uri) 95 match = re.match(urlregexp, uri)
96 protocol = match.group(2) 96 protocol = match.group(2)
97 if protocol == "xmpp": 97 if protocol == "xmpp":
98 protocol = "jabber" 98 protocol = "jabber"
99 if protocol == "aim" or protocol == "icq":
100 protocol = "oscar"
101 if protocol is not None: 99 if protocol is not None:
102 protocol = "prpl-" + protocol 100 protocol = "prpl-" + protocol
103 command = match.group(5) 101 command = match.group(5)
104 paramstring = match.group(7) 102 paramstring = match.group(7)
105 params = {} 103 params = {}