Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2012-11-08 15:09:13 +0400
committerYann Leboulanger <asterix@lagaule.org>2012-11-08 15:09:13 +0400
commit0da05360104dc0f6a21ff0131069a142d38c073b (patch)
treefbda2ad4a542fe0a874dd819d9c91cc7c1f06883
parente5d809af50c0d1e6c273681622a2d02c8433fa4d (diff)
[dpapavas] Improvements for Emacs Gtk binding theme. Fixes #7254
-rw-r--r--src/message_window.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/message_window.py b/src/message_window.py
index b774af346..2167ae456 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -350,8 +350,10 @@ class MessageWindow(object):
# CTRL mask
if modifier & gtk.gdk.CONTROL_MASK:
if keyval == gtk.keysyms.h: # CTRL + h
- control._on_history_menuitem_activate()
- return True
+ if gtk.settings_get_default().get_property(
+ 'gtk-key-theme-name') != 'Emacs':
+ control._on_history_menuitem_activate()
+ return True
elif control.type_id == message_control.TYPE_CHAT and \
keyval == gtk.keysyms.f: # CTRL + f
# CTRL + f moves cursor one char forward when user uses Emacs
@@ -431,8 +433,10 @@ class MessageWindow(object):
control.show_emoticons_menu()
return True
elif keyval == gtk.keysyms.d: # ALT + D show actions menu
- control.on_actions_button_clicked(control.actions_button)
- return True
+ if gtk.settings_get_default().get_property(
+ 'gtk-key-theme-name') != 'Emacs':
+ control.on_actions_button_clicked(control.actions_button)
+ return True
elif control.type_id == message_control.TYPE_GC and \
keyval == gtk.keysyms.t: # ALT + t
control._on_change_subject_menuitem_activate(None)