SF.net SVN: geany:[3102] trunk

[ntrel at users.sourceforge.net]

Revision: 3102
          http://geany.svn.sourceforge.net/geany/?rev=3102&view=rev
Author:   ntrel
Date:     2008-10-16 11:39:34 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Don't connect editor callbacks when creating the editor widget for
the split window plugin (they didn't work anyway, except for
Undo/Redo).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-15 22:32:54 UTC (rev 3101)
+++ trunk/ChangeLog	2008-10-16 11:39:34 UTC (rev 3102)
@@ -1,3 +1,11 @@
+2008-10-16  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+   Don't connect editor callbacks when creating the editor widget for
+   the split window plugin (they didn't work anyway, except for
+   Undo/Redo).
+
+
 2008-10-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * geany.nsi:

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2008-10-15 22:32:54 UTC (rev 3101)
+++ trunk/src/editor.c	2008-10-16 11:39:34 UTC (rev 3102)
@@ -3912,15 +3912,14 @@
 	SSM(sci, SCI_AUTOCSETSEPARATOR, '\n', 0);
 	SSM(sci, SCI_SETSCROLLWIDTHTRACKING, 1, 0);
 
-	/* signal for insert-key(works without too, but to update the right status bar) */
-	/*g_signal_connect(sci, "key-press-event",
-					 G_CALLBACK(keybindings_got_event), GINT_TO_POINTER(new_idx));*/
-	/* signal for the popup menu */
-	g_signal_connect(sci, "button-press-event", G_CALLBACK(on_editor_button_press_event), doc);
-	g_signal_connect(sci, "scroll-event", G_CALLBACK(on_editor_scroll_event), doc->editor);
-	g_signal_connect(sci, "motion-notify-event", G_CALLBACK(on_motion_event), NULL);
-	g_signal_connect(sci, "expose-event", G_CALLBACK(on_editor_expose_event), doc);
-
+	/* only connect signals if this is for the document notebook, not split window */
+	if (doc->editor->sci == NULL)
+	{
+		g_signal_connect(sci, "button-press-event", G_CALLBACK(on_editor_button_press_event), doc);
+		g_signal_connect(sci, "scroll-event", G_CALLBACK(on_editor_scroll_event), doc->editor);
+		g_signal_connect(sci, "motion-notify-event", G_CALLBACK(on_motion_event), NULL);
+		g_signal_connect(sci, "expose-event", G_CALLBACK(on_editor_expose_event), doc);
+	}
 	return sci;
 }
 


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