a bit of refactorization

This commit is contained in:
Yann Leboulanger 2009-12-07 23:30:12 +01:00
parent 2a944e5404
commit 869ad9ec2b
1 changed files with 13 additions and 19 deletions

View File

@ -5007,28 +5007,22 @@ class RosterWindow:
pep_menuitem = xml.get_widget('pep_menuitem') pep_menuitem = xml.get_widget('pep_menuitem')
if gajim.connections[account].pep_supported: if gajim.connections[account].pep_supported:
have_tune = gajim.config.get_per('accounts', account,
'publish_tune')
have_location = gajim.config.get_per('accounts', account,
'publish_location')
pep_submenu = gtk.Menu() pep_submenu = gtk.Menu()
pep_menuitem.set_submenu(pep_submenu) pep_menuitem.set_submenu(pep_submenu)
item = gtk.CheckMenuItem(_('Publish Tune')) def add_item(label, opt_name, func):
pep_submenu.append(item) item = gtk.CheckMenuItem(label)
if not dbus_support.supported: pep_submenu.append(item)
item.set_sensitive(False) if not dbus_support.supported:
else: item.set_sensitive(False)
item.set_active(have_tune) else:
item.connect('toggled', self.on_publish_tune_toggled, account) activ = gajim.config.get_per('accounts', account, opt_name)
item.set_active(activ)
item.connect('toggled', func, account)
item = gtk.CheckMenuItem(_('Publish Location')) add_item(_('Publish Tune'), 'publish_tune',
pep_submenu.append(item) self.on_publish_tune_toggled)
if not dbus_support.supported: add_item(_('Publish Location'), 'publish_location',
item.set_sensitive(False) self.on_publish_location_toggled)
else:
item.set_active(have_location)
item.connect('toggled', self.on_publish_location_toggled,
account)
pep_config = gtk.ImageMenuItem(_('Configure Services...')) pep_config = gtk.ImageMenuItem(_('Configure Services...'))
item = gtk.SeparatorMenuItem() item = gtk.SeparatorMenuItem()