Ubuntu Pastebin

Paste from Marco Trevisan (3v1n0) at Fri, 5 May 2017 20:38:34 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
diff -Nru nautilus-3.24.1/debian/changelog nautilus-3.24.1/debian/changelog
--- nautilus-3.24.1/debian/changelog  2017-04-30 14:47:06.000000000 -0700
+++ nautilus-3.24.1/debian/changelog  2017-05-05 13:34:36.000000000 -0700
@@ -1,3 +1,10 @@
+nautilus (1:3.24.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * 0002-Only-use-a-header-bar-in-GNOME-shell.patch:
+    - Use the primary-titlebar style class for headerbar in unity
+
+ -- Marco Trevisan <marco@ubuntu.com>  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 14:47:06.000000000 -0700
+++ nautilus-3.24.1/debian/patches/0002-Only-use-a-header-bar-in-GNOME-shell.patch  2017-05-05 13:33:26.000000000 -0700
@@ -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 @@
        </object>
      </child>
Download as text