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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132 | diff -Nru nautilus-3.20.1/debian/changelog nautilus-3.20.1/debian/changelog
--- nautilus-3.20.1/debian/changelog 2016-05-28 18:36:46.000000000 +0200
+++ nautilus-3.20.1/debian/changelog 2016-07-18 18:09:05.000000000 +0200
@@ -1,3 +1,10 @@
+nautilus (1:3.20.1-0ubuntu1~yakkety3) UNRELEASED; urgency=medium
+
+ * debian/patches/ubuntu_revert_no_wallpaper.patch:
+ - Ensure nautilus-window is always using a RGBA visual
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Mon, 18 Jul 2016 17:59:02 +0200
+
nautilus (1:3.20.1-0ubuntu1~yakkety2) yakkety; urgency=medium
* Upload to yakkety
diff -Nru nautilus-3.20.1/debian/patches/ubuntu_revert_no_wallpaper.patch nautilus-3.20.1/debian/patches/ubuntu_revert_no_wallpaper.patch
--- nautilus-3.20.1/debian/patches/ubuntu_revert_no_wallpaper.patch 2016-05-28 18:36:46.000000000 +0200
+++ nautilus-3.20.1/debian/patches/ubuntu_revert_no_wallpaper.patch 2016-07-18 17:58:41.000000000 +0200
@@ -13,10 +13,10 @@
create mode 100644 libnautilus-private/nautilus-desktop-background.c
create mode 100644 libnautilus-private/nautilus-desktop-background.h
-Index: nautilus/libnautilus-private/Makefile.am
+Index: nautilus-3.20.1/libnautilus-private/Makefile.am
===================================================================
---- nautilus.orig/libnautilus-private/Makefile.am
-+++ nautilus/libnautilus-private/Makefile.am
+--- nautilus-3.20.1.orig/libnautilus-private/Makefile.am
++++ nautilus-3.20.1/libnautilus-private/Makefile.am
@@ -80,6 +80,8 @@ libnautilus_private_la_SOURCES = \
nautilus-debug.h \
nautilus-default-file-icon.c \
@@ -26,10 +26,10 @@
nautilus-desktop-directory-file.c \
nautilus-desktop-directory-file.h \
nautilus-desktop-directory.c \
-Index: nautilus/libnautilus-private/nautilus-desktop-background.c
+Index: nautilus-3.20.1/libnautilus-private/nautilus-desktop-background.c
===================================================================
--- /dev/null
-+++ nautilus/libnautilus-private/nautilus-desktop-background.c
++++ nautilus-3.20.1/libnautilus-private/nautilus-desktop-background.c
@@ -0,0 +1,601 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
@@ -632,10 +632,10 @@
+ "widget", container,
+ NULL);
+}
-Index: nautilus/libnautilus-private/nautilus-desktop-background.h
+Index: nautilus-3.20.1/libnautilus-private/nautilus-desktop-background.h
===================================================================
--- /dev/null
-+++ nautilus/libnautilus-private/nautilus-desktop-background.h
++++ nautilus-3.20.1/libnautilus-private/nautilus-desktop-background.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
@@ -705,10 +705,10 @@
+};
+
+#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */
-Index: nautilus/src/nautilus-desktop-canvas-view.c
+Index: nautilus-3.20.1/src/nautilus-desktop-canvas-view.c
===================================================================
---- nautilus.orig/src/nautilus-desktop-canvas-view.c
-+++ nautilus/src/nautilus-desktop-canvas-view.c
+--- nautilus-3.20.1.orig/src/nautilus-desktop-canvas-view.c
++++ nautilus-3.20.1/src/nautilus-desktop-canvas-view.c
@@ -39,6 +39,7 @@
#include <fcntl.h>
#include <gdk/gdkx.h>
@@ -731,7 +731,7 @@
}
+static void
-+real_begin_loading (NautilusView *object)
++real_begin_loading (NautilusFilesView *object)
+{
+ NautilusCanvasContainer *canvas_container;
+ NautilusDesktopCanvasView *view;
@@ -797,10 +797,10 @@
g_signal_connect_object (desktop_canvas_view, "realize",
G_CALLBACK (realized_callback), desktop_canvas_view, 0);
g_signal_connect_object (desktop_canvas_view, "unrealize",
-Index: nautilus/src/nautilus-desktop-window.c
+Index: nautilus-3.20.1/src/nautilus-desktop-window.c
===================================================================
---- nautilus.orig/src/nautilus-desktop-window.c
-+++ nautilus/src/nautilus-desktop-window.c
+--- nautilus-3.20.1.orig/src/nautilus-desktop-window.c
++++ nautilus-3.20.1/src/nautilus-desktop-window.c
@@ -40,6 +40,7 @@
struct NautilusDesktopWindowDetails {
@@ -809,7 +809,7 @@
gboolean loaded;
-@@ -311,6 +312,12 @@ unrealize (GtkWidget *widget)
+@@ -313,6 +314,12 @@ unrealize (GtkWidget *widget)
details->size_changed_id = 0;
}
@@ -822,27 +822,7 @@
gtk_widget_destroy (details->desktop_selection);
GTK_WIDGET_CLASS (nautilus_desktop_window_parent_class)->unrealize (widget);
-@@ -334,7 +341,6 @@ realize (GtkWidget *widget)
- {
- NautilusDesktopWindow *window;
- NautilusDesktopWindowDetails *details;
-- GdkVisual *visual;
-
- window = NAUTILUS_DESKTOP_WINDOW (widget);
- details = window->details;
-@@ -343,11 +349,6 @@ realize (GtkWidget *widget)
- gtk_widget_set_events (widget, gtk_widget_get_events (widget)
- | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
-
-- visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
-- if (visual) {
-- gtk_widget_set_visual (widget, visual);
-- }
--
- /* Do the work of realizing. */
- GTK_WIDGET_CLASS (nautilus_desktop_window_parent_class)->realize (widget);
-
-@@ -357,6 +358,9 @@ realize (GtkWidget *widget)
+@@ -359,6 +366,9 @@ realize (GtkWidget *widget)
details->size_changed_id =
g_signal_connect (gtk_window_get_screen (GTK_WINDOW (window)), "size-changed",
G_CALLBACK (nautilus_desktop_window_screen_size_changed), window);
|