Changeset 9873

Timestamp:

07/02/08 11:20:49 (5 months ago)

Author:

js

Message:

Added a function to check for specific features. This makes
implementing a later coming fallback to disco rather easy.

Location:

trunk/src

Files:

• chat_control.py (modified) (4 diffs)
• common/caps.py (modified) (1 diff)
• roster_window.py (modified) (5 diffs)

trunk/src/chat_control.py

@@ -1075 +1075 @@
                 # If we don't have resource, we can't do file transfer
                 # in transports, contact holds our info we need to disable it too
-                if NS_FILE in gajim.capscache[(contact.caps_hash_method,
-                contact.caps_hash)].features:
+                if gajim.capscache.is_supported(contact, NS_FILE):
                         send_file_button.set_sensitive(True)
                 else:
@@ -1082 +1081 @@
 
                 # check if it's possible to convert to groupchat
-                if NS_MUC in gajim.capscache[(contact.caps_hash_method,
-                contact.caps_hash)].features:
+                if gajim.capscache.is_supported(contact, NS_MUC):
                         convert_to_gc_button.set_sensitive(True)
                 else:
@@ -1822 +1820 @@
                 # If we don't have resource, we can't do file transfer
                 # in transports, contact holds our info we need to disable it too
-                if NS_FILE in gajim.capscache[(contact.caps_hash_method,
-                contact.caps_hash)].features:
+                if gajim.capscache.is_supported(contact, NS_FILE):
                         send_file_menuitem.set_sensitive(True)
                 else:
@@ -1829 +1826 @@
 
                 # check if it's possible to convert to groupchat
-                if NS_MUC in gajim.capscache[(contact.caps_hash_method,
-                contact.caps_hash)].features:
+                if gajim.capscache.is_supported(contact, NS_MUC):
                         convert_to_gc_menuitem.set_sensitive(True)
                 else:

trunk/src/common/caps.py

@@ -179 +179 @@
                         q.queried=1
                         con.discoverInfo(jid, '%s#%s' % (node, hash))
+        
+        def is_supported(self, contact, feature):
+                if not contact.resource:
+                        return False
+
+                # FIXME: We assume everything is supported if we got no caps.
+                #        This is the "Asterix way", after 0.12 release, I will
+                #        likely implement a fallback to disco (could be disabled
+                #        for mobile users who pay for traffic)
+                features = self[(contact.caps_hash_method,
+                        contact.caps_hash)].features
+                if feature in features or features == []:
+                        return True
+
+                return False
 
 gajim.capscache = CapsCache(gajim.logger)

trunk/src/roster_window.py

@@ -4885 +4885 @@
                                         self.on_roster_treeview_row_activated, tree_path)
 
-                        if contact.resource and NS_FILE in gajim.capscache[
-                        (contact.caps_hash_method, contact.caps_hash)].features:
+                        if gajim.capscache.is_supported(contact, NS_FILE):
                                 send_file_menuitem.set_sensitive(True)
                                 send_file_menuitem.connect('activate',
@@ -5049 +5048 @@
                         start_chat_menuitem.connect('activate',
                                 gajim.interface.on_open_chat_window, contact, account)
-                        if contact.resource and NS_COMMANDS in gajim.capscache[
-                        (contact.caps_hash_method, contact.caps_hash)].features:
+                        if gajim.capscache.is_supported(contact, NS_COMMANDS):
                                 execute_command_menuitem.set_sensitive(True)
                                 execute_command_menuitem.connect('activate', self.on_execute_command,
@@ -5063 +5061 @@
                         # Else this var is useless but harmless in next connect calls
 
-                        if contact.resource and NS_FILE in gajim.capscache[
-                        (contact.caps_hash_method, contact.caps_hash)].features:
+                        if gajim.capscache.is_supported(contact, NS_FILE):
                                 send_file_menuitem.set_sensitive(True)
                                 send_file_menuitem.connect('activate',
@@ -5480 +5477 @@
                         else: # start_chat, execute_command, send_file
                                 item.connect('activate', action, c, account, c.resource)
-                        if cap and cap not in gajim.capscache[
-                        (c.caps_hash_method, c.caps_hash)].features:
+                        if cap and \
+                        not gajim.capscache.is_supported(c, cap):
                                 item.set_sensitive(False)
                 return sub_menu
@@ -5517 +5514 @@
                                 contact_list, account, self.on_invite_to_new_room, cap=NS_MUC))
                 else:
-                        if NS_MUC in gajim.capscache[(contact.caps_hash_method,
-                        contact.caps_hash)].features:
+                        if gajim.capscache.is_supported(contact, NS_MUC):
                                 invite_menuitem.set_sensitive(True)
                                 invite_to_new_room_menuitem.connect('activate',