Changeset 9265

Timestamp:

01/23/08 17:10:28 (10 months ago)

Author:

steve-e

Message:

padlock icon in merged accounts mode: show when all connected accounts are connected securely, don't show it when one is not secured, do no care about offline accounts.

Location:

trunk/src

Files:

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

trunk/src/common/gajim.py

@@ -269 +269 @@
         '''returns the number of the accounts that are SSL/TLS connected'''
         num_of_secured = 0
-        for account in connections:
+        for account in connections.keys():
                 if account_is_securely_connected(account):
                         num_of_secured += 1
@@ -275 +275 @@
 
 def account_is_securely_connected(account):
-        if account in con_types and con_types[account] in ('tls', 'ssl'):
+        if account_is_connected(account) and \
+        account in con_types and con_types[account] in ('tls', 'ssl'):
                 return True
         else:

trunk/src/gajim.py

@@ -1877 +1877 @@
                 gajim.block_signed_in_notifications[account] = True
                 self.roster.set_actions_menu_needs_rebuild()
+                self.roster.draw_account(account)
                 if self.sleeper.getState() != common.sleepy.STATE_UNKNOWN and \
                 gajim.connections[account].connected in (2, 3):

trunk/src/roster_window.py

@@ -212 +212 @@
                 model = self.tree.get_model()
                 iter = self.get_account_iter(account)
-                if self.regroup:
-                        accounts = gajim.connections.keys()
-                else:
-                        accounts = [account]
-                num_of_accounts = len(accounts)
+                
+                num_of_accounts = gajim.get_number_of_connected_accounts()
                 num_of_secured = gajim.get_number_of_securely_connected_accounts()
-                if num_of_secured and gajim.con_types.has_key(account) and \
-                gajim.con_types[account] in ('tls', 'ssl'):
+                
+                if gajim.account_is_securely_connected(account) and not self.regroup or \
+                self.regroup and num_of_secured and num_of_secured == num_of_accounts:
                         tls_pixbuf = self.window.render_icon(gtk.STOCK_DIALOG_AUTHENTICATION,
                                 gtk.ICON_SIZE_MENU) # the only way to create a pixbuf from stock
-                        if num_of_secured < num_of_accounts:
-                                # Make it transparent
-                                colorspace = tls_pixbuf.get_colorspace()
-                                bps = tls_pixbuf.get_bits_per_sample()
-                                rowstride = tls_pixbuf.get_rowstride()
-                                pixels = tls_pixbuf.get_pixels()
-                                new_pixels = ''
-                                width = tls_pixbuf.get_width()
-                                height = tls_pixbuf.get_height()
-                                for i in range(0, width*height):
-                                        rgb = pixels[4*i:4*i+3]
-                                        new_pixels += rgb
-                                        if rgb == chr(0)*3:
-                                                new_pixels += chr(0)
-                                        else:
-                                                new_pixels += chr(128)
-                                tls_pixbuf = gtk.gdk.pixbuf_new_from_data(new_pixels, colorspace,
-                                        True, bps, width, height, rowstride)
                         model[iter][C_PADLOCK_PIXBUF] = tls_pixbuf
                 else:
@@ -1440 +1420 @@
                                 return
                         info[contact.jid] = vcard.ZeroconfVcardWindow(contact, account)
-
 
         def show_tooltip(self, contact):