Ticket #2133: gajim.fix2133.patch

src/remote_control.py

@@ -21 +21 @@
 from common import gajim
 from common import helpers
 from time import time
-from dialogs import AddNewContactWindow, NewChatDialog
+from dialogs import AddNewContactWindow, NewChatDialog, JoinGroupchatWindow
 
 from common import dbus_support
 if dbus_support.supported:
@@ -568 +568 @@
                 else:
                         for acc in gajim.contacts.get_accounts():
                                 gajim.connections[acc].send_stanza(xml)
+
+        @dbus.service.method(INTERFACE)
+        def join_room(self, *args):
+                room_jid, nick, passwd, account = self._get_real_arguments(args, 4)
+                if not account:
+                        # maybe use the first non local account 
+                        account = gajim.contacts.get_accounts()[0]
+                if nick is None:
+                        nick = ''
+                        gajim.interface.instances[account]['join_gc'] = \
+                                        JoinGroupchatWindow(account, room_jid, nick)
+                else:
+                        gajim.connections[account].join_gc(nick, room_jid, password)

src/gajim-remote.py

@@ -229 +229 @@
                                                         False)
                                         ]
                                 ],
+                        '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 \
                         sys.argv[1] not in self.commands.keys(): # no args or bad args
@@ -240 +257 @@
                         else:
                                 print self.compose_help().encode(PREFERRED_ENCODING)
                         sys.exit(0)
-
+                if self.command == 'handle_uri':
+                        self.handle_uri()
                 self.init_connection()
                 self.check_arguments()
 
@@ -421 +439 @@
                                         'Type "%s help %s" for more info') % 
                                         (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)
+                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:] '''
                 args = sys.argv[2:]

src/gtkgui_helpers.py

@@ -607 +607 @@
         path_to_gajim_script, typ = get_abspath_for_script('gajim-remote', True)
         if path_to_gajim_script:
                 if typ == 'svn':
-                        command = path_to_gajim_script + ' open_chat %s'
+                        command = path_to_gajim_script + ' handle_uri %s'
                 else: # 'installed'
-                        command = 'gajim-remote open_chat %s'
+                        command = 'gajim-remote handle_uri %s'
                 
                 # setting for GNOME/Gconf
                 client.set_bool('/desktop/gnome/url-handlers/xmpp/enabled', True)