Changeset 7829 for branches/gajim_0.11/src/gajim-remote.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/gajim-remote.py (modified) (3 diffs)

branches/gajim_0.11/src/gajim-remote.py

@@ -436 +436 @@
                 argv_len = self.argv_len - 2
                 args = self.commands[self.command][1]
+                if len(args) < argv_len:
+                        send_error(_('Too many arguments. \n'
+                                'Type "%s help %s" for more info') % (BASENAME, self.command))
                 if len(args) > argv_len:
                         if args[argv_len][2]:
@@ -441 +444 @@
                                         'Type "%s help %s" for more info') % 
                                         (args[argv_len][0], BASENAME, self.command))
+                self.arguments = []
+                i = 0
+                for arg in sys.argv[2:]:
+                        i += 1
+                        if i < len(args):
+                                self.arguments.append(arg)
+                        else:
+                                # it's latest argument with spaces
+                                self.arguments.append(' '.join(sys.argv[i+1:]))
+                                break
+                # add empty string for missing args
+                self.arguments += ['']*(len(args)-i)
 
         def handle_uri(self):
@@ -460 +475 @@
         def call_remote_method(self):
                 ''' calls self.method with arguments from sys.argv[2:] '''
-                args = sys.argv[2:]
-                args = [i.decode(PREFERRED_ENCODING) for i in sys.argv[2:]]
+                args = [i.decode(PREFERRED_ENCODING) for i in self.arguments]
                 args = [dbus.String(i) for i in args]
                 try: