From f201500ed5e75cc0f16c701717c5fdb99812ab97 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Fri, 3 Dec 2010 13:28:13 +0000
Subject: [PATCH] Backport Scintilla HG fix: Remove styling idle in destructor
 to avoid crashing when idle called after ScintillaGTK instance destroyed
 (fixes #3111058).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5460 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog                      | 8 ++++++++
 scintilla/gtk/ScintillaGTK.cxx | 1 +
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a676148a..7bd1a716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-03  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * scintilla/gtk/ScintillaGTK.cxx:
+   Backport Scintilla HG fix: Remove styling idle in destructor to
+   avoid crashing when idle called after ScintillaGTK instance
+   destroyed (fixes #3111058).
+
+
 2010-11-29  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/notebook.c:
diff --git a/scintilla/gtk/ScintillaGTK.cxx b/scintilla/gtk/ScintillaGTK.cxx
index ee01f52c..c2884886 100644
--- a/scintilla/gtk/ScintillaGTK.cxx
+++ b/scintilla/gtk/ScintillaGTK.cxx
@@ -363,6 +363,7 @@ ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) :
 }
 
 ScintillaGTK::~ScintillaGTK() {
+	g_idle_remove_by_data(this);
 }
 
 void ScintillaGTK::RealizeThis(GtkWidget *widget) {