Mercurial > pidgin
comparison libpurple/purple-remote @ 18043:6b7b13adb9b1
propagate from branch 'im.pidgin.pidgin' (head ac83216c7b78e652b47f1fd0bcb91f1eaf2cdf36)
to branch 'im.pidgin.pidgin.2.1.0' (head 30a48520e9bc26b0d3914edad456b063cd6cf9fe)
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Mon, 04 Jun 2007 23:48:54 +0000 |
parents | c168d1ae2012 3bcdb320e619 |
children | b9a6272f4039 |
comparison
equal
deleted
inserted
replaced
18036:ee9f7ee0be66 | 18043:6b7b13adb9b1 |
---|---|
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 = {} |