From 8db2ba425aaff107faaa4c7468be63f8ef2fa8e9 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 10 Jan 2014 15:25:27 -0500
Subject: [PATCH] window: Allow unsetting custom titlebar

https://bugzilla.gnome.org/show_bug.cgi?id=720059
---
 gtk/gtkwindow.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index f34f943e64..1b0ad7b960 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3615,7 +3615,7 @@ on_titlebar_title_notify (GtkHeaderBar *titlebar,
 /**
  * gtk_window_set_titlebar:
  * @window: a #GtkWindow
- * @titlebar: the widget to use as titlebar
+ * @titlebar: (allow-none): the widget to use as titlebar
  *
  * Sets a custom titlebar for @window.
  *
@@ -3639,6 +3639,13 @@ gtk_window_set_titlebar (GtkWindow *window,
 
   unset_titlebar (window);
 
+  if (titlebar == NULL)
+    {
+      priv->custom_title = FALSE;
+      priv->client_decorated = FALSE;
+      return;
+    }
+
   if (gdk_window_supports_csd (window))
     gdk_window_enable_csd (window);
   else