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

Never remove CTRL+N accelerator

This commit is contained in:
Denis Fomin 2010-11-28 00:02:36 +03:00
parent 3de0fc2129
commit ff16089722
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/roster_window.py
View File

@ -5887,11 +5887,6 @@ class RosterWindow:
# open the menu # open the menu
new_chat_menuitem = self.xml.get_object('new_chat_menuitem') new_chat_menuitem = self.xml.get_object('new_chat_menuitem')
ag = gtk.accel_groups_from_object(self.window)[0] ag = gtk.accel_groups_from_object(self.window)[0]
# remove the existing accelerator
if self.have_new_chat_accel:
new_chat_menuitem.remove_accelerator(ag, gtk.keysyms.n,
gtk.gdk.CONTROL_MASK)
self.have_new_chat_accel = False
if self.new_chat_menuitem_handler_id: if self.new_chat_menuitem_handler_id:
new_chat_menuitem.handler_disconnect( new_chat_menuitem.handler_disconnect(
@ -5913,11 +5908,6 @@ class RosterWindow:
self.new_chat_menuitem_handler_id = new_chat_menuitem.\ self.new_chat_menuitem_handler_id = new_chat_menuitem.\
connect('activate', connect('activate',
self.on_new_chat_menuitem_activate, account) self.on_new_chat_menuitem_activate, account)
if not self.have_new_chat_accel:
new_chat_menuitem.add_accelerator('activate', ag,
gtk.keysyms.n, gtk.gdk.CONTROL_MASK,
gtk.ACCEL_VISIBLE)
self.have_new_chat_accel = True
def show_appropriate_context_menu(self, event, iters): def show_appropriate_context_menu(self, event, iters):
# iters must be all of the same type # iters must be all of the same type
@ -6249,6 +6239,11 @@ class RosterWindow:
accel_group.connect_group(gtk.keysyms.j, gtk.gdk.CONTROL_MASK, accel_group.connect_group(gtk.keysyms.j, gtk.gdk.CONTROL_MASK,
gtk.ACCEL_MASK, self.on_ctrl_j) gtk.ACCEL_MASK, self.on_ctrl_j)
# Setting CTRL+N to be the shortcut for show Start chat dialog
new_chat_menuitem = self.xml.get_object('new_chat_menuitem')
new_chat_menuitem.add_accelerator('activate', accel_group,
gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
gajim.ged.register_event_handler('presence-received', ged.GUI1, gajim.ged.register_event_handler('presence-received', ged.GUI1,
self._nec_presence_received) self._nec_presence_received)
# presence has to be fully handled so that contact is added to occupant # presence has to be fully handled so that contact is added to occupant