Revision: 3051 http://geany.svn.sourceforge.net/geany/?rev=3051&view=rev Author: ntrel Date: 2008-10-07 12:14:57 +0000 (Tue, 07 Oct 2008)

Log Message: ----------- Fix segfault when holding Alt and scrolling editor window.

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

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-07 12:03:45 UTC (rev 3050) +++ trunk/ChangeLog 2008-10-07 12:14:57 UTC (rev 3051) @@ -3,6 +3,8 @@ * plugins/splitwindow.c: Add toolbar with Refresh button to sync to the current document, and an Unsplit button (reuses existing string). + * src/editor.c: + Fix segfault when holding Alt and scrolling editor window.

2008-10-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-10-07 12:03:45 UTC (rev 3050) +++ trunk/src/editor.c 2008-10-07 12:14:57 UTC (rev 3051) @@ -3810,7 +3810,7 @@ static gboolean on_editor_scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer user_data) { - /* Handle scroll events if Shift or Alt is pressed and scroll whole pages instead of a + /* Handle scroll events if Alt is pressed and scroll whole pages instead of a * few lines only, maybe this could/should be done in Scintilla directly */ if (event->state & GDK_MOD1_MASK) { @@ -3951,6 +3951,7 @@ GeanyEditor *editor = g_new0(GeanyEditor, 1);

editor->document = doc; + doc->editor = editor; /* needed in case some editor functions/callbacks expect it */

editor->auto_indent = (iprefs->auto_indent_mode != GEANY_AUTOINDENT_NONE); editor->line_wrapping = editor_prefs.line_wrapping;

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