[geany/geany] ba0d36: Merge pull request #420 from techee/vte_keybindings

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 13 Feb 2015 00:01:17 UTC
Commit:      ba0d364f64bea634610e92cfffad9457a77bf953
             https://github.com/geany/geany/commit/ba0d364f64bea634610e92cfffad9457a77bf953

Log Message:
-----------
Merge pull request #420 from techee/vte_keybindings

Revert some OS X keybinding changes for VTE


Modified Paths:
--------------
    src/vte.c

Modified: src/vte.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -329,7 +329,7 @@ void vte_close(void)
 static gboolean vte_keyrelease_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
 	if (ui_is_keyval_enter_or_return(event->keyval) ||
-		((event->keyval == GDK_c) && (event->state & GEANY_PRIMARY_MOD_MASK)))
+		((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK)))
 	{
 		/* assume any text on the prompt has been executed when pressing Enter/Return */
 		clean = TRUE;
@@ -350,7 +350,7 @@ static gboolean vte_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer
 		event->keyval == GDK_d ||
 		event->keyval == GDK_C ||
 		event->keyval == GDK_D) &&
-		event->state & GEANY_PRIMARY_MOD_MASK &&
+		event->state & GDK_CONTROL_MASK &&
 		! (event->state & GDK_SHIFT_MASK) && ! (event->state & GDK_MOD1_MASK))
 	{
 		vte_restart(widget);



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).