[gedit-code-assistance] Move destruction code to dispose
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit-code-assistance] Move destruction code to dispose
- Date: Sat, 3 Mar 2012 15:01:57 +0000 (UTC)
commit f922e65fc93a86c3e16eee2fc2d81ae6b9480e59
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date: Sat Mar 3 15:59:52 2012 +0100
Move destruction code to dispose
src/gcp-document.vala | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/gcp-document.vala b/src/gcp-document.vala
index 209111c..345e184 100644
--- a/src/gcp-document.vala
+++ b/src/gcp-document.vala
@@ -30,6 +30,7 @@ class Document : GLib.Object
private string? d_text;
private File? d_location;
private bool d_tainted;
+ private bool d_dispose_ran;
public signal void location_changed(File? previous_location);
public signal void changed();
@@ -100,8 +101,15 @@ class Document : GLib.Object
d_document.remove_source_marks(start, end, error_mark_category);
}
- ~Document()
+ public override void dispose()
{
+ if (d_dispose_ran)
+ {
+ return;
+ }
+
+ d_dispose_ran = true;
+
d_document.modified_changed.disconnect(on_document_modified_changed);
d_document.notify["location"].disconnect(on_location_changed);
@@ -113,7 +121,6 @@ class Document : GLib.Object
if (diag != null)
{
diag.diagnostics_updated.disconnect(on_diagnostic_updated);
-
remove_marks();
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]