Changeset 9306

Timestamp:

02/05/08 23:13:16 (10 months ago)

Author:

asterix

Message:

Prevent traceback when gajim-remote is used while gajim is not running. Add a check_gajim_running command to gajim-remote

Files:

• trunk/src/gajim-remote.py (modified) (23 diffs)

trunk/src/gajim-remote.py

@@ -60 +60 @@
 
         def __init__(self):
-                self.argv_len = len(sys.argv) 
+                self.argv_len = len(sys.argv)
                 # define commands dict. Prototype :
                 # {
@@ -74 +74 @@
                                         [
                                                 #User gets help for the command, specified by this parameter
-                                                (_('command'), 
+                                                (_('command'),
                                                 _('show help on command'), False)
                                         ]
-                                ], 
+                                ],
                         'toggle_roster_appearance' : [
                                         _('Shows or hides the roster window'),
                                         []
-                                ], 
+                                ],
                         'show_next_pending_event': [
                                         _('Pops up a window with the next pending event'),
@@ -94 +94 @@
                                         ]
 
-                                ],      
+                                ],
                         'list_accounts': [
                                         _('Prints a list of registered accounts'),
                                         []
-                                ], 
+                                ],
                         'change_status': [
                                         _('Changes the status of account or accounts'),
                                         [
 #offline, online, chat, away, xa, dnd, invisible should not be translated
-                                                (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True), 
-                                                (_('message'), _('status message'), False), 
+                                                (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True),
+                                                (_('message'), _('status message'), False),
                                                 (_('account'), _('change status of account "account". '
                 'If not specified, try to change status of all accounts that have '
@@ -110 +110 @@
                                         ]
                                 ],
-                        'open_chat': [ 
-                                        _('Shows the chat dialog so that you can send messages to a contact'), 
+                        'open_chat': [
+                                        _('Shows the chat dialog so that you can send messages to a contact'),
                                         [
                                                 ('jid', _('JID of the contact that you want to chat with'),
-                                                        True), 
+                                                        True),
                                                 (_('account'), _('if specified, contact is taken from the '
                                                 'contact list of this account'), False)
@@ -122 +122 @@
                                         _('Sends new chat message to a contact in the roster. Both OpenPGP key '
                                         'and account are optional. If you want to set only \'account\', '
-                                        'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), 
+                                        'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'),
                                         [
                                                 ('jid', _('JID of the contact that will receive the message'), True),
@@ -135 +135 @@
                                         _('Sends new single message to a contact in the roster. Both OpenPGP key '
                                         'and account are optional. If you want to set only \'account\', '
-                                        'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), 
+                                        'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'),
                                         [
                                                 ('jid', _('JID of the contact that will receive the message'), True),
@@ -145 +145 @@
                                                         'using this account'), False),
                                         ]
-                                ], 
+                                ],
                         'send_groupchat_message':[
-                                        _('Sends new message to a groupchat you\'ve joined.'), 
+                                        _('Sends new message to a groupchat you\'ve joined.'),
                                         [
                                                 ('room_jid', _('JID of the room that will receive the message'), True),
@@ -156 +156 @@
                                 ],
                         'contact_info': [
-                                        _('Gets detailed info on a contact'), 
+                                        _('Gets detailed info on a contact'),
                                         [
                                                 ('jid', _('JID of the contact'), True)
@@ -162 +162 @@
                                 ],
                         'account_info': [
-                                        _('Gets detailed info on a account'), 
+                                        _('Gets detailed info on a account'),
                                         [
                                                 ('account', _('Name of the account'), True)
@@ -189 +189 @@
                         'prefs_del': [
                                         _('Deletes a preference item'),
-                                        [ 
-                                                (_('key'), _('name of the preference to be deleted'), True) 
+                                        [
+                                                (_('key'), _('name of the preference to be deleted'), True)
                                         ]
                                 ],
@@ -200 +200 @@
                         'remove_contact': [
                                         _('Removes contact from roster'),
-                                        [ 
+                                        [
                                                 ('jid', _('JID of the contact'), True),
                                                 (_('account'), _('if specified, contact is taken from the '
@@ -209 +209 @@
                         'add_contact': [
                                         _('Adds contact to roster'),
-                                        [ 
+                                        [
                                                 (_('jid'), _('JID of the contact'), True),
                                                 (_('account'), _('Adds new contact to this account'), False)
@@ -227 +227 @@
                                                 (_('account'), _(''), False)
                                         ]
-                                ],                              
+                                ],
 
                         'get_unread_msgs_number': [
@@ -240 +240 @@
                                 ],
                         'send_xml': [
-                                        _('Sends custom XML'), 
+                                        _('Sends custom XML'),
                                         [
                                                 ('xml', _('XML to send'), True),
@@ -264 +264 @@
                                         ]
                                 ],
+                        'check_gajim_running':[
+                                        _('Check if Gajim is running'),
+                                        []
+                                ],
 
                         }
+                self.sbus = None
                 if self.argv_len  < 2 or \
                         sys.argv[1] not in self.commands.keys(): # no args or bad args
@@ -278 +283 @@
                 if self.command == 'handle_uri':
                         self.handle_uri()
+                if self.command == 'check_gajim_running':
+                        print self.check_gajim_running()
+                        sys.exit(0)
                 self.init_connection()
                 self.check_arguments()
@@ -324 +332 @@
                                 for pref_key in pref_keys:
                                         result = '%s = %s' % (pref_key, res[pref_key])
-                                        if isinstance(result, unicode): 
+                                        if isinstance(result, unicode):
                                                 print result.encode(PREFERRED_ENCODING)
                                         else:
@@ -333 +341 @@
                                 print unicode(res).encode(PREFERRED_ENCODING)
 
+        def check_gajim_running(self):
+                if not self.sbus:
+                        try:
+                                self.sbus = dbus.SessionBus()
+                        except:
+                                raise exceptions.SessionBusNotPresent
+
+                test = False
+                if hasattr(self.sbus, 'name_has_owner'):
+                        if self.sbus.name_has_owner(SERVICE):
+                                test = True
+                elif dbus.dbus_bindings.bus_name_has_owner(self.sbus.get_connection(),
+                SERVICE):
+                        test = True
+                return test
+
         def init_connection(self):
                 ''' create the onnection to the session dbus,
@@ -341 +365 @@
                         raise exceptions.SessionBusNotPresent
 
+                if not self.check_gajim_running():
+                        send_error(_('It seems Gajim is not running. So you can\'t use gajim-remote.'))
                 obj = self.sbus.get_object(SERVICE, OBJ_PATH)
                 interface = dbus.Interface(obj, INTERFACE)
@@ -369 +395 @@
                         command_props = self.commands[command]
                         arguments_str = self.make_arguments_row(command_props[1])
-                        str = _('Usage: %s %s %s \n\t %s') % (BASENAME, command, 
+                        str = _('Usage: %s %s %s \n\t %s') % (BASENAME, command,
                                         arguments_str, command_props[0])
                         if len(command_props[1]) > 0:
@@ -384 +410 @@
                 commands.sort()
                 for command in commands:
-                        str += '  ' + command 
+                        str += '  ' + command
                         for argument in self.commands[command][1]:
                                 str += ' '
@@ -458 +484 @@
                         if args[argv_len][2]:
                                 send_error(_('Argument "%s" is not specified. \n'
-                                        'Type "%s help %s" for more info') % 
+                                        'Type "%s help %s" for more info') %
                                         (args[argv_len][0], BASENAME, self.command))
                 self.arguments = []
@@ -486 +512 @@
                         self.command = sys.argv[1] = 'join_room'
                         return
-                        
+
                 sys.exit(0)