SF.net SVN: geany: [1955] trunk

[ntrel at users.sourceforge.net]

Revision: 1955
          http://geany.svn.sourceforge.net/geany/?rev=1955&view=rev
Author:   ntrel
Date:     2007-10-18 04:37:45 -0700 (Thu, 18 Oct 2007)

Log Message:
-----------
Only connect vte_keypress() if enable_bash_keys pref is not set.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-17 12:55:47 UTC (rev 1954)
+++ trunk/ChangeLog	2007-10-18 11:37:45 UTC (rev 1955)
@@ -1,3 +1,9 @@
+2007-10-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/vte.c:
+   Only connect vte_keypress() if enable_bash_keys pref is not set.
+
+
 2007-10-17  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * tagmanager/tm_tag.c, tagmanager/c.c, TODO:

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2007-10-17 12:55:47 UTC (rev 1954)
+++ trunk/src/vte.c	2007-10-18 11:37:45 UTC (rev 1955)
@@ -204,7 +204,8 @@
 
 	g_signal_connect(G_OBJECT(vte), "child-exited", G_CALLBACK(vte_start), NULL);
 	g_signal_connect(G_OBJECT(vte), "button-press-event", G_CALLBACK(vte_button_pressed), NULL);
-	g_signal_connect(G_OBJECT(vte), "event", G_CALLBACK(vte_keypress), NULL);
+	if (! vc->enable_bash_keys)
+		g_signal_connect(G_OBJECT(vte), "event", G_CALLBACK(vte_keypress), NULL);
 	g_signal_connect(G_OBJECT(vte), "motion-notify-event", G_CALLBACK(on_motion_event), NULL);
 	//g_signal_connect(G_OBJECT(vte), "drag-data-received", G_CALLBACK(vte_drag_data_received), NULL);
 	//g_signal_connect(G_OBJECT(vte), "drag-drop", G_CALLBACK(vte_drag_drop), NULL);
@@ -240,7 +241,9 @@
 
 static gboolean vte_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-	if (event->type != GDK_KEY_RELEASE || vc->enable_bash_keys)
+	g_assert(!vc->enable_bash_keys);
+
+	if (event->type != GDK_KEY_RELEASE)
 		return FALSE;
 
 	if ((event->keyval == GDK_c ||


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.