[gtk+/gtk-2-24] GtkMountOperation: Clean up a dangling signal handler
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] GtkMountOperation: Clean up a dangling signal handler
- Date: Tue, 6 May 2014 17:39:00 +0000 (UTC)
commit c9da8bddca8f4e75e2ac6d7b362dd90fe7a844bc
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Feb 3 21:00:17 2014 -0500
GtkMountOperation: Clean up a dangling signal handler
Based on a patch by Eugene Shatokhin,
https://bugzilla.gnome.org/show_bug.cgi?id=723366
gtk/gtkmountoperation.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 6ddaabf..bd240ed 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -194,7 +194,12 @@ gtk_mount_operation_finalize (GObject *object)
GtkMountOperationPrivate *priv = operation->priv;
if (priv->parent_window)
- g_object_unref (priv->parent_window);
+ {
+ g_signal_handlers_disconnect_by_func (priv->parent_window,
+ gtk_widget_destroyed,
+ &priv->parent_window);
+ g_object_unref (priv->parent_window);
+ }
if (priv->screen)
g_object_unref (priv->screen);
@@ -1425,21 +1430,20 @@ gtk_mount_operation_set_parent (GtkMountOperation *op,
g_signal_handlers_disconnect_by_func (priv->parent_window,
gtk_widget_destroyed,
&priv->parent_window);
- priv->parent_window = NULL;
+ g_object_unref (priv->parent_window);
}
-
- if (parent)
+ priv->parent_window = parent;
+ if (priv->parent_window)
{
- priv->parent_window = g_object_ref (parent);
-
- g_signal_connect (parent, "destroy",
+ g_object_ref (priv->parent_window);
+ g_signal_connect (priv->parent_window, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&priv->parent_window);
-
- if (priv->dialog)
- gtk_window_set_transient_for (GTK_WINDOW (priv->dialog), parent);
}
+ if (priv->dialog)
+ gtk_window_set_transient_for (GTK_WINDOW (priv->dialog), priv->parent_window);
+
g_object_notify (G_OBJECT (op), "parent");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]