From 65b648541012e96a209630b531535f9905a265bf Mon Sep 17 00:00:00 2001
From: Denis Fomin <fominde@gmail.com>
Date: Tue, 20 Nov 2012 13:00:57 +0400
Subject: [PATCH] hide 'bookmark_ button' if private storage not supported.part
2
---
src/groupchat_control.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 8c8c96e4d4..4796b9ac4d 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -328,10 +328,11 @@ class GroupchatControl(ChatControlBase):
if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'):
img = self.xml.get_object('image7')
img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU)
- if not gajim.connections[self.account].private_storage_supported:
- widget.hide()
- else:
- widget.show()
+ widget.set_sensitive(
+ gajim.connections[self.account].private_storage_supported or \
+ (gajim.connections[self.account].pubsub_supported and \
+ gajim.connections[self.account].pubsub_publish_options_supported))
+ widget.show()
widget = self.xml.get_object('list_treeview')
id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded)
@@ -843,7 +844,9 @@ class GroupchatControl(ChatControlBase):
if self.contact.jid in gajim.config.get_per('accounts', self.account,
'minimized_gc').split(' '):
minimize_menuitem.set_active(True)
- if not gajim.connections[self.account].private_storage_supported:
+ conn = gajim.connections[self.account]
+ if not conn.private_storage_supported and (not conn.pubsub_supported or \
+ not conn.pubsub_publish_options_supported):
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,
--
GitLab