Changeset 9899

Timestamp:

07/08/08 21:15:54 (5 months ago)

Author:

steve-e

Message:

Fix two caps related tracebacks:

Quick fix: What does not exist cannot support anything. Fixes #4031.
Fix variable referencing. Fixes #4076.

Location:

trunk/src

Files:

• common/caps.py (modified) (1 diff)
• dialogs.py (modified) (2 diffs)
• roster_window.py (modified) (1 diff)

trunk/src/common/caps.py

@@ -181 +181 @@
         
         def is_supported(self, contact, feature):
-                if not contact.resource:
+                if not contact or not contact.resource:
                         return False
 

trunk/src/dialogs.py

@@ -2316 +2316 @@
                         # if offline or connecting
                         ErrorDialog(_('Connection not available'),
-                _('Please make sure you are connected with "%s".') % self.account)
+                                _('Please make sure you are connected with "%s".') % self.account)
                         return
-                if type(self.to) == type([]):
+                if isinstance(self.to, list):
                         sender_list = [i[0].jid + '/' + i[0].resource for i in self.to]
                 else:
@@ -2326 +2326 @@
                         if self.completion_dict.has_key(to_whom_jid):
                                 to_whom_jid = self.completion_dict[to_whom_jid].jid
+
                         subject = self.subject_entry.get_text().decode('utf-8')
                         begin, end = self.message_tv_buffer.get_bounds()
                         message = self.message_tv_buffer.get_text(begin, end).decode('utf-8')
 
-                        if to_whom_jid.find('/announce/') != -1:
+                        if '/announce/' in to_whom_jid:
                                 gajim.connections[self.account].send_motd(to_whom_jid, subject,
                                         message)
-                                return
+                                continue
 
                         if self.session:

trunk/src/roster_window.py

@@ -5494 +5494 @@
                         invite_to_new_room_menuitem.set_submenu(self.build_resources_submenu(
                                 contact_list, account, self.on_invite_to_new_room, cap=NS_MUC))
-                else:
-                        if gajim.capscache.is_supported(contact, NS_MUC):
-                                invite_menuitem.set_sensitive(True)
-                                invite_to_new_room_menuitem.connect('activate',
-                                        self.on_invite_to_new_room, list_)
-                        else:
-                                invite_menuitem.set_sensitive(False)
+                elif len(list_) == 1 and gajim.capscache.is_supported(contact, NS_MUC):
+                        invite_menuitem.set_sensitive(True)
+                        invite_to_new_room_menuitem.connect('activate',
+                                self.on_invite_to_new_room, list_)
+                else:
+                        invite_menuitem.set_sensitive(False)
                 # transform None in 'jabber'
                 c_t = contacts_transport or 'jabber'