| ... |
... |
@@ -182,7 +182,6 @@ class StatusIcon: |
|
182
|
182
|
start_chat_menuitem = self._ui.start_chat_menuitem
|
|
183
|
183
|
single_message_menuitem = self._ui.single_message_menuitem
|
|
184
|
184
|
status_menuitem = self._ui.status_menu
|
|
185
|
|
- join_gc_menuitem = self._ui.join_gc_menuitem
|
|
186
|
185
|
sounds_mute_menuitem = self._ui.sounds_mute_menuitem
|
|
187
|
186
|
show_roster_menuitem = self._ui.show_roster_menuitem
|
|
188
|
187
|
|
| ... |
... |
@@ -195,9 +194,6 @@ class StatusIcon: |
|
195
|
194
|
self.popup_menus.append(sub_menu)
|
|
196
|
195
|
status_menuitem.set_submenu(sub_menu)
|
|
197
|
196
|
|
|
198
|
|
- gc_sub_menu = Gtk.Menu() # gc is always a submenu
|
|
199
|
|
- join_gc_menuitem.set_submenu(gc_sub_menu)
|
|
200
|
|
-
|
|
201
|
197
|
for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'):
|
|
202
|
198
|
uf_show = helpers.get_uf_show(show, use_mnemonic=True)
|
|
203
|
199
|
item = Gtk.MenuItem.new_with_mnemonic(uf_show)
|
| ... |
... |
@@ -227,7 +223,6 @@ class StatusIcon: |
|
227
|
223
|
app.zeroconf_is_connected())
|
|
228
|
224
|
start_chat_menuitem.set_sensitive(iskey)
|
|
229
|
225
|
single_message_menuitem.set_sensitive(iskey)
|
|
230
|
|
- join_gc_menuitem.set_sensitive(iskey)
|
|
231
|
226
|
|
|
232
|
227
|
accounts_list = sorted(app.contacts.get_accounts())
|
|
233
|
228
|
|
| ... |
... |
@@ -245,9 +240,6 @@ class StatusIcon: |
|
245
|
240
|
self.single_message_handler_id = single_message_menuitem.\
|
|
246
|
241
|
connect('activate',
|
|
247
|
242
|
self.on_single_message_menuitem_activate, account)
|
|
248
|
|
- # join gc
|
|
249
|
|
- app.interface.roster.add_bookmarks_list(gc_sub_menu,
|
|
250
|
|
- account)
|
|
251
|
243
|
break # No other account connected
|
|
252
|
244
|
else:
|
|
253
|
245
|
# 2 or more 'real' accounts are connected, make submenus
|
| ... |
... |
@@ -268,28 +260,6 @@ class StatusIcon: |
|
268
|
260
|
self.on_single_message_menuitem_activate, account)
|
|
269
|
261
|
account_menu_for_single_message.append(item)
|
|
270
|
262
|
|
|
271
|
|
- # join gc
|
|
272
|
|
- gc_item = Gtk.MenuItem.new_with_label(
|
|
273
|
|
- _('using account %s') % account_label)
|
|
274
|
|
- gc_sub_menu.append(gc_item)
|
|
275
|
|
- gc_menuitem_menu = Gtk.Menu()
|
|
276
|
|
- app.interface.roster.add_bookmarks_list(gc_menuitem_menu,
|
|
277
|
|
- account)
|
|
278
|
|
- gc_item.set_submenu(gc_menuitem_menu)
|
|
279
|
|
- gc_sub_menu.show_all()
|
|
280
|
|
-
|
|
281
|
|
- newitem = Gtk.SeparatorMenuItem.new() # separator
|
|
282
|
|
- gc_sub_menu.append(newitem)
|
|
283
|
|
- newitem = Gtk.MenuItem.new_with_mnemonic(_('_Manage Bookmarks…'))
|
|
284
|
|
- newitem.connect('activate',
|
|
285
|
|
- app.interface.roster.on_manage_bookmarks_menuitem_activate)
|
|
286
|
|
- newitem.set_sensitive(False)
|
|
287
|
|
- gc_sub_menu.append(newitem)
|
|
288
|
|
- for account in accounts_list:
|
|
289
|
|
- if app.account_supports_private_storage(account):
|
|
290
|
|
- newitem.set_sensitive(True)
|
|
291
|
|
- break
|
|
292
|
|
-
|
|
293
|
263
|
sounds_mute_menuitem.set_active(not app.config.get('sounds_on'))
|
|
294
|
264
|
|
|
295
|
265
|
win = app.interface.roster.window
|