copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Action menu for join gc

This commit is contained in:
Yann Leboulanger 2005-06-11 16:29:05 +00:00
parent 3eab7400af
commit 5f2c0faa83
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/roster_window.py
View File

@ -263,9 +263,6 @@ class RosterWindow:
service_disco_menuitem.handler_disconnect( service_disco_menuitem.handler_disconnect(
self.service_disco_handler_id) self.service_disco_handler_id)
self.service_disco_handler_id = None self.service_disco_handler_id = None
if self.join_gc_handler_id:
join_gc_menuitem.handler_disconnect(self.join_gc_handler_id)
self.join_gc_handler_id = None
if self.new_message_menuitem_handler_id: if self.new_message_menuitem_handler_id:
new_message_menuitem.handler_disconnect( new_message_menuitem.handler_disconnect(
self.new_message_menuitem_handler_id) self.new_message_menuitem_handler_id)
@ -275,8 +272,7 @@ class RosterWindow:
add_new_contact_menuitem.remove_submenu() add_new_contact_menuitem.remove_submenu()
if service_disco_menuitem.get_submenu(): if service_disco_menuitem.get_submenu():
service_disco_menuitem.remove_submenu() service_disco_menuitem.remove_submenu()
if join_gc_menuitem.get_submenu(): join_gc_menuitem.remove_submenu()
join_gc_menuitem.remove_submenu()
if new_message_menuitem.get_submenu(): if new_message_menuitem.get_submenu():
new_message_menuitem.remove_submenu() new_message_menuitem.remove_submenu()
if len(gajim.connections) > 0: if len(gajim.connections) > 0:
@ -308,11 +304,10 @@ class RosterWindow:
#FIXME: delmonico hack here [get bookmakrs and add them] #FIXME: delmonico hack here [get bookmakrs and add them]
if gajim.connections[account].connected <= 1: if gajim.connections[account].connected <= 1:
continue continue
for bookmark in gajim.connections[account].bookmarks: for bookmark in gajim.connections[account].bookmarks:
print bookmark['name'] item = gtk.MenuItem(bookmark['name'])
item = gtk.MenuItem(bookmark['name']) sub_menu.append(item)
sub_menu.append(item) item.connect('activate', self.join_gc_room, account, bookmark)
item.connect('activate', self.join_gc_room, account, bookmark)
newitem = gtk.MenuItem() # seperator newitem = gtk.MenuItem() # seperator
sub_menu.append(newitem) sub_menu.append(newitem)
@ -361,11 +356,6 @@ class RosterWindow:
self.service_disco_handler_id = service_disco_menuitem.connect( self.service_disco_handler_id = service_disco_menuitem.connect(
'activate', self.on_service_disco_menuitem_activate, 'activate', self.on_service_disco_menuitem_activate,
gajim.connections.keys()[0]) gajim.connections.keys()[0])
#join_gc
if not self.join_gc_handler_id:
self.join_gc_handler_id = join_gc_menuitem.connect(
'activate', self.on_join_gc_activate,
gajim.connections.keys()[0])
if not self.new_message_menuitem_handler_id: if not self.new_message_menuitem_handler_id:
self.new_message_menuitem_handler_id = new_message_menuitem.\ self.new_message_menuitem_handler_id = new_message_menuitem.\
connect('activate', self.on_new_message_menuitem_activate, connect('activate', self.on_new_message_menuitem_activate,
@ -1568,7 +1558,6 @@ class RosterWindow:
self.nb_unread = 0 self.nb_unread = 0
self.add_new_contact_handler_id = False self.add_new_contact_handler_id = False
self.service_disco_handler_id = False self.service_disco_handler_id = False
self.join_gc_handler_id = False
self.new_message_menuitem_handler_id = False self.new_message_menuitem_handler_id = False
self.regroup = 0 self.regroup = 0
self.regroup = gajim.config.get('mergeaccounts') self.regroup = gajim.config.get('mergeaccounts')