diff -Nru nautilus-3.24.1/debian/changelog nautilus-3.24.1/debian/changelog --- nautilus-3.24.1/debian/changelog 2017-04-30 21:47:06.000000000 +0000 +++ nautilus-3.24.1/debian/changelog 2017-05-05 20:34:36.000000000 +0000 @@ -1,3 +1,11 @@ +nautilus (1:3.24.1-0ubuntu3) artful; urgency=medium + + * 0002-Only-use-a-header-bar-in-GNOME-shell.patch: + - Use the primary-titlebar style class for headerbar in unity + (LP: #1689239) + + -- Marco Trevisan Fri, 05 May 2017 13:34:36 -0700 + nautilus (1:3.24.1-0ubuntu2) artful; urgency=medium * Update 06_never_exec_nonexec_launchers.patch: diff -Nru nautilus-3.24.1/debian/patches/0002-Only-use-a-header-bar-in-GNOME-shell.patch nautilus-3.24.1/debian/patches/0002-Only-use-a-header-bar-in-GNOME-shell.patch --- nautilus-3.24.1/debian/patches/0002-Only-use-a-header-bar-in-GNOME-shell.patch 2017-04-30 21:47:06.000000000 +0000 +++ nautilus-3.24.1/debian/patches/0002-Only-use-a-header-bar-in-GNOME-shell.patch 2017-05-05 20:34:36.000000000 +0000 @@ -11,9 +11,11 @@ src/resources/ui/nautilus-window.ui | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) ---- a/src/nautilus-window.c -+++ b/src/nautilus-window.c -@@ -104,6 +104,7 @@ struct _NautilusWindowPrivate +Index: nautilus-3.24.1/src/nautilus-window.c +=================================================================== +--- nautilus-3.24.1.orig/src/nautilus-window.c ++++ nautilus-3.24.1/src/nautilus-window.c +@@ -103,6 +103,7 @@ struct _NautilusWindowPrivate GList *slots; NautilusWindowSlot *active_slot; @@ -21,7 +23,7 @@ GtkWidget *content_paned; /* Side Pane */ -@@ -1996,6 +1997,35 @@ setup_toolbar (NautilusWindow *window) +@@ -1934,6 +1935,36 @@ setup_toolbar (NautilusWindow *window) { GtkWidget *path_bar; GtkWidget *location_entry; @@ -39,6 +41,7 @@ + { + context = gtk_widget_get_style_context (window->priv->toolbar); + gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TITLEBAR); ++ gtk_style_context_add_class (context, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + gtk_window_set_titlebar (GTK_WINDOW (window), NULL); + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (window->priv->toolbar), + FALSE); @@ -57,7 +60,7 @@ g_object_set (window->priv->toolbar, "window", window, NULL); g_object_bind_property (window, "disable-chrome", -@@ -2761,6 +2791,7 @@ nautilus_window_class_init (NautilusWind +@@ -2702,6 +2733,7 @@ nautilus_window_class_init (NautilusWind gtk_widget_class_set_template_from_resource (wclass, "/org/gnome/nautilus/ui/nautilus-window.ui"); gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, toolbar); @@ -65,8 +68,10 @@ gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, content_paned); gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, sidebar); gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, places_sidebar); ---- a/src/resources/ui/nautilus-window.ui -+++ b/src/resources/ui/nautilus-window.ui +Index: nautilus-3.24.1/src/resources/ui/nautilus-window.ui +=================================================================== +--- nautilus-3.24.1.orig/src/resources/ui/nautilus-window.ui ++++ nautilus-3.24.1/src/resources/ui/nautilus-window.ui @@ -17,7 +17,7 @@