GtkWindow: Avoid an early exit

When gtk_window_set_titlebar (win, NULL) is called, we were taking
an early exit and forgot to re-map the window. This does not normally
happen in practice, but glade is about to get a 'csd' switch which
lets one toggle back and forth between titlebar and no titlebar.
This commit is contained in:
Matthias Clasen 2014-10-17 13:59:39 -04:00
parent 1a1c30adfa
commit 8821d488c5

View File

@ -3977,7 +3977,8 @@ gtk_window_set_titlebar (GtkWindow *window,
priv->custom_title = FALSE;
priv->client_decorated = FALSE;
gtk_style_context_remove_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_CSD);
return;
goto out;
}
if (gtk_window_supports_csd (window))
@ -4001,6 +4002,7 @@ gtk_window_set_titlebar (GtkWindow *window,
gtk_style_context_add_class (gtk_widget_get_style_context (titlebar),
GTK_STYLE_CLASS_TITLEBAR);
out:
if (was_mapped)
gtk_widget_map (widget);
}