Mercurial > pidgin
comparison libpurple/purple-remote @ 23085:8b8603d354be
merge of 'a9b83251335ed42daf54164bf8c5120166f0e589'
and 'cd8c000c5205ad2bdbbc2c7de67b5f08b72e17c8'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Wed, 21 May 2008 22:26:51 +0000 |
parents | 4b4be7609072 |
children | 94f3d88b5dc5 |
comparison
equal
deleted
inserted
replaced
23083:02ef6c5c6650 | 23085:8b8603d354be |
---|---|
33 result = self.cobj.obj.__getattr__(self.attr)(*args) | 33 result = self.cobj.obj.__getattr__(self.attr)(*args) |
34 if result == 0: | 34 if result == 0: |
35 raise "Error: " + self.attr + " " + str(args) + " returned " + str(result) | 35 raise "Error: " + self.attr + " " + str(args) + " returned " + str(result) |
36 return result | 36 return result |
37 | 37 |
38 def show_help(): | 38 def show_help(requested=False): |
39 print """This program uses D-Bus to communicate with purple. | 39 print """This program uses D-Bus to communicate with purple. |
40 | 40 |
41 Usage: | 41 Usage: |
42 | 42 |
43 %s "command1" "command2" ... | 43 %s "command1" "command2" ... |
64 quit | 64 quit |
65 | 65 |
66 PurpleAccountsFindConnected?name=&protocol=prpl-jabber | 66 PurpleAccountsFindConnected?name=&protocol=prpl-jabber |
67 PurpleAccountsFindConnected(,prpl-jabber) | 67 PurpleAccountsFindConnected(,prpl-jabber) |
68 """ % sys.argv[0] | 68 """ % sys.argv[0] |
69 if (requested): | |
70 sys.exit(0) | |
71 else: | |
72 sys.exit(1) | |
69 | 73 |
70 cpurple = CheckedObject(purple) | 74 cpurple = CheckedObject(purple) |
71 | 75 |
72 urlregexp = r"^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?" | 76 urlregexp = r"^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?" |
73 | 77 |
211 methodparams.append(int(value)) | 215 methodparams.append(int(value)) |
212 else: | 216 else: |
213 raise "Don't know how to handle type \"%s\"" % type | 217 raise "Don't know how to handle type \"%s\"" % type |
214 return purple.__getattr__(command)(*methodparams) | 218 return purple.__getattr__(command)(*methodparams) |
215 show_help() | 219 show_help() |
216 raise "Unknown command: %s" % command | |
217 | 220 |
218 if len(sys.argv) == 1: | 221 if len(sys.argv) == 1: |
219 show_help() | 222 show_help() |
223 elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"): | |
224 show_help(True) | |
220 elif (obj == None): | 225 elif (obj == None): |
221 print "No existing libpurple instance detected." | 226 print "No existing libpurple instance detected." |
222 sys.exit(1); | 227 sys.exit(1); |
223 | 228 |
224 for arg in sys.argv[1:]: | 229 for arg in sys.argv[1:]: |