Changeset 8724 for branches/gajim_0.11.1

Timestamp:

09/05/07 13:44:05 (15 months ago)

Author:

asterix

Message:

don't allow to bookmark a room on server that don't support private storage.

Location:

branches/gajim_0.11.1/src

Files:

• common/connection_handlers.py (modified) (2 diffs)
• common/connection.py (modified) (1 diff)
• config.py (modified) (1 diff)
• dialogs.py (modified) (1 diff)
• groupchat_control.py (modified) (2 diffs)
• roster_window.py (modified) (8 diffs)

branches/gajim_0.11.1/src/common/connection_handlers.py

@@ -1040 +1040 @@
                                 self.dispatch('METACONTACTS', meta_list)
                         else:
-                                self.metacontacts_supported = False
+                                self.private_storage_supported = False
                         # We can now continue connection by requesting the roster
                         self.connection.initRoster()
@@ -1248 +1248 @@
                         ns = storage_tag.getNamespace()
                         if ns == 'storage:metacontacts':
-                                self.metacontacts_supported = False
+                                self.private_storage_supported = False
                                 # Private XML Storage (XEP49) is not supported by server
                                 # Continue connecting

branches/gajim_0.11.1/src/common/connection.py

@@ -98 +98 @@
                 # server {'icq': ['icq.server.com', 'icq2.server.com'], }
                 self.vcard_supported = True
-                self.metacontacts_supported = True
+                self.private_storage_supported = True
         # END __init__
 

branches/gajim_0.11.1/src/config.py

@@ -2484 +2484 @@
                         if gajim.connections[account].is_zeroconf:
                                 continue
-                        iter = self.treestore.append(None, [None, account,None,
+                        if not gajim.connections[account].private_storage_supported:
+                                continue
+                        iter = self.treestore.append(None, [None, account, None,
                                 None, None, None, None])
 

branches/gajim_0.11.1/src/dialogs.py

@@ -1191 +1191 @@
                         self.xml.get_widget('join_button').set_sensitive(False)
 
+                if not gajim.connections[account].private_storage_supported:
+                        self.xml.get_widget('auto_join_checkbutton').set_sensitive(False)
+
                 self.window.show_all()
 

branches/gajim_0.11.1/src/groupchat_control.py

@@ -216 +216 @@
                 xm = gtkgui_helpers.get_glade('gc_control_popup_menu.glade')
 
-                widget = xm.get_widget('bookmark_room_menuitem')
-                id = widget.connect('activate',
+                self.bookmark_room_menuitem = xm.get_widget('bookmark_room_menuitem')
+                id = self.bookmark_room_menuitem.connect('activate',
                         self._on_bookmark_room_menuitem_activate)
-                self.handlers[id] = widget
+                self.handlers[id] = self.bookmark_room_menuitem
 
                 widget = xm.get_widget('change_nick_menuitem')
@@ -482 +482 @@
                 # hide chat buttons
                 childs[5].set_active(self.hide_chat_buttons_current)
+                if not gajim.connections[self.account].private_storage_supported:
+                        self.bookmark_room_menuitem.set_sensitive(False)
                 if gajim.gc_connected[self.account][self.room_jid]:
                         c = gajim.contacts.get_gc_contact(self.account, self.room_jid,

branches/gajim_0.11.1/src/roster_window.py

@@ -871 +871 @@
                 
                 connected_accounts = gajim.get_number_of_connected_accounts()
+
+                connected_accounts_with_private_storage = 0
+
                 if connected_accounts > 1: # 2 or more accounts? make submenus
                         add_sub_menu = gtk.Menu()
@@ -894 +897 @@
 
                                 # join gc
+                                if gajim.connections[account].private_storage_supported:
+                                        connected_accounts_with_private_storage += 1
                                 label = gtk.Label()
                                 label.set_markup('<u>' + account.upper() +'</u>')
@@ -901 +906 @@
                                 gc_item.connect('state-changed',
                                         gtkgui_helpers.on_bm_header_changed_state)
+                                gc_item = gtk.MenuItem(_('using account %s') % account, False)
                                 gc_sub_menu.append(gc_item)
                                 
                                 self.add_bookmarks_list(gc_sub_menu, account)
-
-                                # the 'manage gc bookmarks' item is shown
-                                # below to avoid duplicate code
 
                                 # add
@@ -918 +921 @@
                                 disco_item.connect('activate',
                                         self.on_service_disco_menuitem_activate, account)
-
 
                         add_new_contact_menuitem.set_submenu(add_sub_menu)
@@ -931 +933 @@
                                 if gajim.account_is_connected(account): # THE connected account
                                         # gc
+                                        if gajim.connections[account].private_storage_supported:
+                                                connected_accounts_with_private_storage += 1
                                         self.add_bookmarks_list(gc_sub_menu, account)
+                                        gc_sub_menu.show_all()
                                         # add
                                         if not self.add_new_contact_handler_id:
@@ -975 +980 @@
                                                         item.set_sensitive(False)
 
+                if connected_accounts_with_private_storage > 0:
+                        # At least one account with private storage support
                         # show the 'manage gc bookmarks' item
                         newitem = gtk.SeparatorMenuItem() # separator
                         gc_sub_menu.append(newitem)
+
+                        newitem = gtk.ImageMenuItem(_('_Manage Bookmarks...'))
+                        img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES,
+                                gtk.ICON_SIZE_MENU)
+                        newitem.set_image(img)
+                        newitem.connect('activate',
+                                self.on_manage_bookmarks_menuitem_activate)
+                        gc_sub_menu.append(newitem)
+                        gc_sub_menu.show_all()
 
                 connected_accounts_with_vcard = []
@@ -1009 +1025 @@
                         profile_avatar_menuitem.set_sensitive(True)
 
-                        newitem = gtk.ImageMenuItem(_('_Manage Bookmarks...'))
-                        img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES,
-                                gtk.ICON_SIZE_MENU)
-                        newitem.set_image(img)
-                        newitem.connect('activate',
-                                self.on_manage_bookmarks_menuitem_activate)
-                        gc_sub_menu.append(newitem)
-                        gc_sub_menu.show_all()
-                        
                 # Advanced Actions
                 if len(gajim.connections) == 0: # user has no accounts
@@ -4034 +4041 @@
         def on_drop_in_contact(self, widget, account_source, c_source, account_dest,
                 c_dest, was_big_brother, context, etime):
-                if not gajim.connections[account_source].metacontacts_supported or not \
-                gajim.connections[account_dest].metacontacts_supported:
+                if not gajim.connections[account_source].private_storage_supported or not\
+                gajim.connections[account_dest].private_storage_supported:
                         dialogs.WarningDialog(_('Metacontacts storage not supported by your '
                                 'server'),