Merge branch 'feature/upstream' into develop

1 files changed, 6 insertions, 4 deletions

diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index c975564..3d4f609 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -161,11 +161,13 @@ public class PublishingDialog : Gtk.Dialog {
     protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
         assert(to_publish.size > 0);
 
-        bool use_header = false;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
-        if (use_header)
+        bool use_header = Resources.use_header_bar() == 1;
+        Object(use_header_bar: Resources.use_header_bar());
+        if (use_header) {
             ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
+        } else {
+            get_content_area().set_spacing(6);
+        }
 
         resizable = false;
         modal = true;