[cheese/gnome-3-12] Use avatar chooser headerbar only when requested

[David King <davidk src gnome org>]

commit 23e8df7c35edfaee6363d66ab57de457b2f57e1e
Author: Iain Lane <iain lane canonical com>
Date:   Thu Apr 24 12:14:04 2014 +0100

    Use avatar chooser headerbar only when requested
    
    Use headerbar in the avatar chooser dialog only when necessary according
    to the "gtk-shell-shows-menubar" setting.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728866

 libcheese/cheese-avatar-chooser.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/libcheese/cheese-avatar-chooser.c b/libcheese/cheese-avatar-chooser.c
index 6750016..a0053b0 100644
--- a/libcheese/cheese-avatar-chooser.c
+++ b/libcheese/cheese-avatar-chooser.c
@@ -149,6 +149,21 @@ cheese_avatar_chooser_class_init (CheeseAvatarChooserClass *klass)
   g_object_class_install_properties (object_class, PROP_LAST, properties);
 }
 
+static gboolean
+dialogs_use_header (void)
+{
+    GtkSettings *settings;
+    gboolean use_header;
+
+    settings = gtk_settings_get_default ();
+
+    g_object_get (G_OBJECT (settings),
+                  "gtk-dialogs-use-header", &use_header,
+                  NULL);
+
+    return use_header;
+}
+
 /**
  * cheese_avatar_chooser_new:
  *
@@ -159,7 +174,8 @@ cheese_avatar_chooser_class_init (CheeseAvatarChooserClass *klass)
 GtkWidget *
 cheese_avatar_chooser_new (void)
 {
-  return g_object_new (CHEESE_TYPE_AVATAR_CHOOSER, NULL);
+  return g_object_new (CHEESE_TYPE_AVATAR_CHOOSER, "use-header-bar",
+                       dialogs_use_header (), NULL);
 }
 
 /**