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

Timestamp:

01/06/07 12:00:50 (2 years ago)

Author:

asterix

Message:

merge changeset from trunk except pyopenssl stuff

Files:

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

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

@@ -76 +76 @@
                                 ], 
                         'show_next_pending_event': [
-                                        _('Popups a window with the next pending event'),
+                                        _('Pops up a window with the next pending event'),
                                         []
                                 ],
                         'list_contacts': [
-                                        _('Prints a list of all contacts in the roster. Each contact appear on a separate line'),
-                                        [
-                                                (_('account'), _('show only contacts of the given account'), False)
+                                        _('Prints a list of all contacts in the roster. Each contact '
+                                        'appears on a separate line'),
+                                        [
+                                                (_('account'), _('show only contacts of the given account'),
+                                                        False)
                                         ]
 
@@ -212 +214 @@
 
                         'get_unread_msgs_number': [
-                                _('Returns number of unreaded messages'),
+                                _('Returns number of unread messages'),
                                         [ ]
                                 ],
@@ -230 +232 @@
                                         ]
                                 ],
+                        'handle_uri': [
+                                        _('Handle a xmpp:/ uri'),
+                                        [
+                                                (_('uri'), _(''), True),
+                                                (_('account'), _(''), False)
+                                        ]
+                                ],
+                        'join_room': [
+                                        _('Join a MUC room'),
+                                        [
+                                                (_('room'), _(''), True),
+                                                (_('nick'), _(''), False),
+                                                (_('password'), _(''), False),
+                                                (_('account'), _(''), False)
+                                        ]
+                                ],
+
                         }
                 if self.argv_len  < 2 or \
@@ -241 +260 @@
                                 print self.compose_help().encode(PREFERRED_ENCODING)
                         sys.exit(0)
-
+                if self.command == 'handle_uri':
+                        self.handle_uri()
                 self.init_connection()
                 self.check_arguments()
@@ -422 +442 @@
                                         (args[argv_len][0], BASENAME, self.command))
 
+        def handle_uri(self):
+                if not sys.argv[2:][0].startswith('xmpp:'):
+                        send_error(_('Wrong uri'))
+                sys.argv[2] = sys.argv[2][5:]
+                uri = sys.argv[2:][0]
+                if not '?' in uri:
+                        self.command = sys.argv[1] = 'open_chat'
+                        return
+                (jid, action) = uri.split('?', 1)
+                sys.argv[2] = jid
+                if action == 'join':
+                        self.command = sys.argv[1] = 'join_room'
+                        return
+                        
+                sys.exit(0)
+
         def call_remote_method(self):
                 ''' calls self.method with arguments from sys.argv[2:] '''