[ekiga] CallHistoryViewGtk: Fixed double delete.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] CallHistoryViewGtk: Fixed double delete.
- Date: Sun, 15 Mar 2015 15:45:10 +0000 (UTC)
commit e44496030cae662db052f7c7adb0ad8ed2e390db
Author: Damien Sandras <dsandras seconix com>
Date: Sat Feb 7 16:15:36 2015 +0100
CallHistoryViewGtk: Fixed double delete.
Deleting the priv object should occur on finalize, not dispose (which
might be called several times).
.../gui/gtk-frontend/call-history-view-gtk.cpp | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index 75345ba..650fd0c 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -260,7 +260,7 @@ on_map_cb (G_GNUC_UNUSED GtkWidget *widget,
/* GObject stuff */
static void
-call_history_view_gtk_dispose (GObject* obj)
+call_history_view_gtk_finalize (GObject* obj)
{
CallHistoryViewGtk* view = NULL;
@@ -268,10 +268,9 @@ call_history_view_gtk_dispose (GObject* obj)
delete view->priv;
- G_OBJECT_CLASS (call_history_view_gtk_parent_class)->dispose (obj);
+ G_OBJECT_CLASS (call_history_view_gtk_parent_class)->finalize (obj);
}
-
static void
call_history_view_gtk_init (G_GNUC_UNUSED CallHistoryViewGtk* self)
{
@@ -282,7 +281,7 @@ static void
call_history_view_gtk_class_init (CallHistoryViewGtkClass* klass)
{
GObjectClass* gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->dispose = call_history_view_gtk_dispose;
+ gobject_class->finalize = call_history_view_gtk_finalize;
signals[ACTIONS_CHANGED_SIGNAL] =
g_signal_new ("actions-changed",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]