Author: mkestner
Date: 2007-05-01 12:31:02 -0400 (Tue, 01 May 2007)
New Revision: 76531
Modified:
trunk/stetic/ChangeLog
trunk/stetic/libsteticui/ActionGroupToolbar.cs
trunk/stetic/libsteticui/PaletteBackend.cs
trunk/stetic/libsteticui/PluggableWidget.cs
trunk/stetic/libsteticui/ProjectView.cs
trunk/stetic/libsteticui/SignalsEditor.cs
trunk/stetic/libsteticui/WidgetDesigner.cs
trunk/stetic/libsteticui/WidgetFactory.cs
trunk/stetic/stetic/DesignerView.cs
Log:
2007-04-27 Mike Kestner <[EMAIL PROTECTED]>
* libsteticui/WidgetFactory.cs:
* libsteticui/ProjectView.cs:
* libsteticui/PaletteBackend.cs:
* libsteticui/SignalsEditor.cs:
* libsteticui/ActionGroupToolbar.cs:
* libsteticui/WidgetDesigner.cs:
* libsteticui/PluggableWidget.cs:
* stetic/DesignerView.cs: Call base.Dispose on GLib.Objects after
all other dispose actions are performed.
Modified: trunk/stetic/ChangeLog
===================================================================
--- trunk/stetic/ChangeLog 2007-05-01 15:28:29 UTC (rev 76530)
+++ trunk/stetic/ChangeLog 2007-05-01 16:31:02 UTC (rev 76531)
@@ -1,5 +1,17 @@
2007-04-27 Mike Kestner <[EMAIL PROTECTED]>
+ * libsteticui/WidgetFactory.cs:
+ * libsteticui/ProjectView.cs:
+ * libsteticui/PaletteBackend.cs:
+ * libsteticui/SignalsEditor.cs:
+ * libsteticui/ActionGroupToolbar.cs:
+ * libsteticui/WidgetDesigner.cs:
+ * libsteticui/PluggableWidget.cs:
+ * stetic/DesignerView.cs: Call base.Dispose on GLib.Objects after
+ all other dispose actions are performed.
+
+2007-04-27 Mike Kestner <[EMAIL PROTECTED]>
+
* libstetic/editor/ActionToolbar.cs (FillMenu): can't Destroy
after Disposing the widgets. Just Destroy, as it disposes.
Modified: trunk/stetic/libsteticui/ActionGroupToolbar.cs
===================================================================
--- trunk/stetic/libsteticui/ActionGroupToolbar.cs 2007-05-01 15:28:29 UTC
(rev 76530)
+++ trunk/stetic/libsteticui/ActionGroupToolbar.cs 2007-05-01 16:31:02 UTC
(rev 76531)
@@ -100,9 +100,9 @@
agroupEditor = null;
}
- base.Dispose ();
if (!singleGroupMode)
ActionGroups = null;
+ base.Dispose ();
}
public Wrapper.ActionGroupCollection ActionGroups {
Modified: trunk/stetic/libsteticui/PaletteBackend.cs
===================================================================
--- trunk/stetic/libsteticui/PaletteBackend.cs 2007-05-01 15:28:29 UTC (rev
76530)
+++ trunk/stetic/libsteticui/PaletteBackend.cs 2007-05-01 16:31:02 UTC (rev
76531)
@@ -291,11 +291,11 @@
public override void Dispose ()
{
- base.Dispose ();
group.ActionAdded -= OnActionGroupChanged;
group.ActionRemoved -= OnActionGroupChanged;
group.ActionChanged -= OnActionGroupChanged;
group.ObjectChanged -= OnActionGroupChanged;
+ base.Dispose ();
}
public void Fill ()
Modified: trunk/stetic/libsteticui/PluggableWidget.cs
===================================================================
--- trunk/stetic/libsteticui/PluggableWidget.cs 2007-05-01 15:28:29 UTC (rev
76530)
+++ trunk/stetic/libsteticui/PluggableWidget.cs 2007-05-01 16:31:02 UTC (rev
76531)
@@ -86,11 +86,11 @@
public override void Dispose ()
{
- base.Dispose ();
if (app.UseExternalBackend) {
app.BackendChanged -= OnBackendChanged;
app.BackendChanging -= OnBackendChanging;
}
+ base.Dispose ();
}
internal virtual void OnBackendChanged (ApplicationBackend
oldBackend)
Modified: trunk/stetic/libsteticui/ProjectView.cs
===================================================================
--- trunk/stetic/libsteticui/ProjectView.cs 2007-05-01 15:28:29 UTC (rev
76530)
+++ trunk/stetic/libsteticui/ProjectView.cs 2007-05-01 16:31:02 UTC (rev
76531)
@@ -34,9 +34,9 @@
public override void Dispose ()
{
- base.Dispose ();
frontend.disposed = true;
System.Runtime.Remoting.RemotingServices.Disconnect
(frontend);
+ base.Dispose ();
}
}
Modified: trunk/stetic/libsteticui/SignalsEditor.cs
===================================================================
--- trunk/stetic/libsteticui/SignalsEditor.cs 2007-05-01 15:28:29 UTC (rev
76530)
+++ trunk/stetic/libsteticui/SignalsEditor.cs 2007-05-01 16:31:02 UTC (rev
76531)
@@ -42,10 +42,10 @@
public override void Dispose ()
{
- base.Dispose ();
session.Dispose ();
frontend.disposed = true;
System.Runtime.Remoting.RemotingServices.Disconnect
(frontend);
+ base.Dispose ();
}
internal void NotifySignalActivated ()
Modified: trunk/stetic/libsteticui/WidgetDesigner.cs
===================================================================
--- trunk/stetic/libsteticui/WidgetDesigner.cs 2007-05-01 15:28:29 UTC (rev
76530)
+++ trunk/stetic/libsteticui/WidgetDesigner.cs 2007-05-01 16:31:02 UTC (rev
76531)
@@ -208,12 +208,11 @@
if (!autoCommitChanges)
editedProject.Dispose ();
- base.Dispose ();
-
System.Runtime.Remoting.RemotingServices.Disconnect
(frontend);
frontend = null;
rootWidget = null;
selection = null;
+ base.Dispose ();
}
public void Save ()
Modified: trunk/stetic/libsteticui/WidgetFactory.cs
===================================================================
--- trunk/stetic/libsteticui/WidgetFactory.cs 2007-05-01 15:28:29 UTC (rev
76530)
+++ trunk/stetic/libsteticui/WidgetFactory.cs 2007-05-01 16:31:02 UTC (rev
76531)
@@ -130,8 +130,8 @@
public override void Dispose ()
{
+ instance.Destroy ();
base.Dispose ();
- instance.Destroy ();
}
}
}
Modified: trunk/stetic/stetic/DesignerView.cs
===================================================================
--- trunk/stetic/stetic/DesignerView.cs 2007-05-01 15:28:29 UTC (rev 76530)
+++ trunk/stetic/stetic/DesignerView.cs 2007-05-01 16:31:02 UTC (rev 76531)
@@ -40,9 +40,9 @@
public override void Dispose ()
{
- base.Dispose ();
design.Dispose ();
actionbox.Dispose ();
+ base.Dispose ();
}
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
