Changeset 3456 for branches/gajim_0.8.2

Timestamp:

09/06/05 14:03:23 (3 years ago)

Author:

dkirov

Message:

fix: show vcard on contact_info

Location:

branches/gajim_0.8.2/src

Files:

• gajim-remote.py (modified) (10 diffs)
• remote_control.py (modified) (5 diffs)

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

@@ -39 +39 @@
 
 def send_error(error_message):
-        '''  Writes error message to stderr and exits '''
-        sys.stderr.write(error_message + '\n')
-        sys.stderr.flush()
-        sys.exit(1)
+                '''  Writes error message to stderr and exits '''
+                sys.stderr.write(error_message + '\n')
+                sys.stderr.flush()
+                sys.exit(1)
+
 try:
         import dbus
@@ -156 +157 @@
                         send_error(self.compose_help())
                 self.command = sys.argv[1]
-                
                 if self.command == 'help':
                         if self.argv_len == 3:
@@ -173 +173 @@
                                 id = self.sbus.add_signal_receiver(self.show_vcard_info, 
                                         'VcardInfo', INTERFACE, SERVICE, OBJ_PATH)
-                        except:
+                        except Exception, e:
                                 send_error(_('Service not available'))
                 
@@ -223 +223 @@
                         interface = self.service.get_object(OBJ_PATH, INTERFACE)
                 else:
-                        send_error(_('Unknown D-Bus version: %s') % _version)
+                        send_error(_('Unknown D-Bus version: %s') % _version[1])
                         
                 # get the function asked
@@ -297 +297 @@
                                         if res != '':
                                                 ret_str += '\t' + res
+                                elif type(val) == dict:
+                                        ret_str += self.print_info(level+1, val)
                         ret_str = '%s(%s)\n' % (spacing, ret_str[1:])
                 elif isinstance(prop_dict, dict):
@@ -316 +318 @@
                                         if res != '':
                                                 ret_str += '%s%s: \n%s' % (spacing, key, res)
-                                else:
-                                        self.send_warning(_('Unknown type %s ') % type(val))
                 return ret_str
                 
@@ -442 +442 @@
                         if args and len(args) >= 5:
                                 props_dict = self.unrepr(args[4].get_args_list()[0])
-
                 if props_dict:
                         print self.print_info(0,props_dict[0])
@@ -448 +447 @@
                 # so we leave the leak - nothing can be done
                 if _version[1] >= 41:
-                        self.sbus.remove_signal_receiver(show_vcard_info, 'VcardInfo', 
+                        self.sbus.remove_signal_receiver(self.show_vcard_info, 'VcardInfo', 
                                 INTERFACE, SERVICE, OBJ_PATH)
         
@@ -464 +463 @@
         def gtk_quit(self):
                 if _version[1] >= 41:
-                        self.sbus.remove_signal_receiver(show_vcard_info, 'VcardInfo', 
+                        self.sbus.remove_signal_receiver(self.show_vcard_info, 'VcardInfo', 
                                 INTERFACE, SERVICE, OBJ_PATH)
                 gtk.main_quit()
@@ -489 +488 @@
                 return None
 
+
 if __name__ == '__main__':
         GajimRemote()

branches/gajim_0.8.2/src/remote_control.py

@@ -279 +279 @@
                 if self.disabled:
                         return
-                
                 [jid] = self._get_real_arguments(args, 1)
+                if not isinstance(jid, unicode):
+                        jid = unicode(jid)
                 if not jid:
                         # FIXME: raise exception for missing argument (0.3+)
@@ -288 +289 @@
                 
                 for account in accounts:
-                        if gajim.contacts[account].has_key(jid):
+                        if gajim.contacts[account].__contains__(jid):
                                 self.vcard_account =  account
-                                gajim.connections[account].register_handler('VCARD', 
-                                        self._receive_vcard)
                                 gajim.connections[account].request_vcard(jid)
                                 break
@@ -303 +302 @@
                         result = gajim.contacts.keys()
                         if result and len(result) > 0:
-                                return result
+                                result_array = []
+                                for account in result:
+                                        result_array.append(account.encode('utf-8'))
+                                return result_array
                 return None
 
@@ -325 +327 @@
                         else:
                                 # 'for_account: is not recognised:', 
-                                # FIXME: there can be a return status for this [0.3+]
                                 return None
                 else:
@@ -358 +359 @@
                         return True
                 return False
-
-        def _receive_vcard(self,account, array):
-                if self.vcard_account:
-                        gajim.connections[self.vcard_account].unregister_handler('VCARD', 
-                                self._receive_vcard)
-                        self.unregistered_vcard = None
-                        if self.disabled:
-                                return
-                        if _version[1] >=30:
-                                self.VcardInfo(repr(array))
-                        else:
-                                self.emit_signal(INTERFACE, 'VcardInfo', 
-                                        repr(array))
 
         def _get_real_arguments(self, args, desired_length):