summaryrefslogtreecommitdiff
path: root/gtk/gtkwindow.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-01-27 13:07:13 -0500
committerMatthias Clasen <mclasen@redhat.com>2016-01-27 13:09:40 -0500
commit625f3e5f3940192ed21519c2477bd283a3fa4ae2 (patch)
treebf44cae7a6c74125da11697b55f00150abcf63b3 /gtk/gtkwindow.c
parent88c3456d2fed626448059272b2a0db3f06db6e70 (diff)
downloadgtk+-625f3e5f3940192ed21519c2477bd283a3fa4ae2.tar.gz
window: Always disconnect signal handlers
We connect to the titlebar widgets change notification regardless whether it is internally created or not, so don't make the signal handler disconnection conditional on that either.
Diffstat (limited to 'gtk/gtkwindow.c')
-rw-r--r--gtk/gtkwindow.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2ff433def2..d86f74fc11 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4028,13 +4028,11 @@ unset_titlebar (GtkWindow *window)
{
GtkWindowPrivate *priv = window->priv;
- if (priv->titlebar != NULL)
- g_signal_handlers_disconnect_by_func (priv->titlebar,
- on_titlebar_title_notify,
- window);
-
if (priv->title_box != NULL)
{
+ g_signal_handlers_disconnect_by_func (priv->title_box,
+ on_titlebar_title_notify,
+ window);
gtk_widget_unparent (priv->title_box);
priv->title_box = NULL;
priv->titlebar = NULL;