[ekiga] Added a (missing\!?) dispose function to the assistant
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Added a (missing\!?) dispose function to the assistant
- Date: Mon, 14 Jan 2013 15:22:53 +0000 (UTC)
commit cec6f2136d13dd5e1623952cbcb3b30c581ce43d
Author: Julien Puydt <jpuydt free fr>
Date: Mon Jan 14 16:22:38 2013 +0100
Added a (missing\!?) dispose function to the assistant
src/gui/assistant.cpp | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index 7c7b6d2..1ea54c4 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -1627,11 +1627,29 @@ ekiga_assistant_cancel (GtkAssistant *gtkassistant)
static void
-ekiga_assistant_finalize (GObject *object)
+ekiga_assistant_dispose (GObject *object)
{
EkigaAssistant *assistant = EKIGA_ASSISTANT (object);
- g_object_unref (assistant->priv->icon);
+ for (std::vector<boost::signals::connection>::iterator iter = assistant->priv->connections.begin ();
+ iter != assistant->priv->connections.end ();
+ ++iter)
+ iter->disconnect();
+ assistant->priv->connections.clear ();
+
+ if (assistant->priv->icon) {
+
+ g_object_unref (assistant->priv->icon);
+ assistant->priv->icon = NULL;
+ }
+
+ G_OBJECT_CLASS (ekiga_assistant_parent_class)->dispose (object);
+}
+
+static void
+ekiga_assistant_finalize (GObject *object)
+{
+ EkigaAssistant *assistant = EKIGA_ASSISTANT (object);
delete assistant->priv;
assistant->priv = NULL;
@@ -1649,6 +1667,7 @@ ekiga_assistant_class_init (EkigaAssistantClass *klass)
assistant_class->apply = ekiga_assistant_apply;
assistant_class->cancel = ekiga_assistant_cancel;
+ object_class->dispose = ekiga_assistant_dispose;
object_class->finalize = ekiga_assistant_finalize;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]