Merge lp:~3v1n0/nautilus/progress-ql-present-fix into lp:~ubuntu-desktop/nautilus/precise

Proposed by Marco Trevisan (Treviño) on 2013-09-10
Status: Merged
Merged at revision: 303
Proposed branch: lp:~3v1n0/nautilus/progress-ql-present-fix
Merge into: lp:~ubuntu-desktop/nautilus/precise
Diff against target: 210 lines (+43/-38)
2 files modified
debian/changelog (+7/-0)
debian/patches/12_unity_launcher_support.patch (+36/-38)
To merge this branch: bzr merge lp:~3v1n0/nautilus/progress-ql-present-fix
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2013-09-10 Pending
Review via email: mp+184797@code.launchpad.net

Commit message

debian/patches/12_unity_launcher_support.patch:
 - Present the transfer window with server timestamp (lp: #887821)

Description of the change

Present progress window using the server time, so that it will be always put on focus by the window managers.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-08 18:04:23 +0000
3+++ debian/changelog 2013-09-10 14:52:33 +0000
4@@ -1,3 +1,10 @@
5+nautilus (1:3.4.2-0ubuntu9) precise; urgency=low
6+
7+ * debian/patches/12_unity_launcher_support.patch:
8+ - Present the transfer window with server timestamp (lp: #887821)
9+
10+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 10 Sep 2013 16:28:29 +0200
11+
12 nautilus (1:3.4.2-0ubuntu8) precise; urgency=low
13
14 * debian/patches/git_fix_touch_double_click.patch: upstream patch to try
15
16=== modified file 'debian/patches/12_unity_launcher_support.patch'
17--- debian/patches/12_unity_launcher_support.patch 2012-06-01 06:11:40 +0000
18+++ debian/patches/12_unity_launcher_support.patch 2013-09-10 14:52:33 +0000
19@@ -1,8 +1,8 @@
20 === modified file 'configure.in'
21-Index: nautilus-3.3.92/configure.in
22+Index: nautilus/configure.in
23 ===================================================================
24---- nautilus-3.3.92.orig/configure.in 2012-03-20 11:19:28.411758136 +0100
25-+++ nautilus-3.3.92/configure.in 2012-03-20 11:19:28.671758147 +0100
26+--- nautilus.orig/configure.in 2013-09-10 16:36:15.464340455 +0200
27++++ nautilus/configure.in 2013-09-10 16:36:15.744336935 +0200
28 @@ -10,6 +10,8 @@
29 m4_define(exif_minver, 0.6.20)
30 m4_define(exempi_minver, 2.1.0)
31@@ -50,10 +50,10 @@
32 nautilus-sendto ext: $enable_nst_extension
33 Tracker support: $build_tracker
34
35-Index: nautilus-3.3.92/libnautilus-private/nautilus-progress-info.c
36+Index: nautilus/libnautilus-private/nautilus-progress-info.c
37 ===================================================================
38---- nautilus-3.3.92.orig/libnautilus-private/nautilus-progress-info.c 2012-02-06 20:44:45.000000000 +0100
39-+++ nautilus-3.3.92/libnautilus-private/nautilus-progress-info.c 2012-03-20 11:19:28.675758148 +0100
40+--- nautilus.orig/libnautilus-private/nautilus-progress-info.c 2013-09-10 16:35:51.004647954 +0200
41++++ nautilus/libnautilus-private/nautilus-progress-info.c 2013-09-10 16:36:15.744336935 +0200
42 @@ -52,6 +52,8 @@
43 char *status;
44 char *details;
45@@ -115,10 +115,10 @@
46 info->progress_at_idle = TRUE;
47 queue_idle (info, FALSE);
48 }
49-Index: nautilus-3.3.92/libnautilus-private/nautilus-progress-info.h
50+Index: nautilus/libnautilus-private/nautilus-progress-info.h
51 ===================================================================
52---- nautilus-3.3.92.orig/libnautilus-private/nautilus-progress-info.h 2011-07-31 20:29:17.000000000 +0200
53-+++ nautilus-3.3.92/libnautilus-private/nautilus-progress-info.h 2012-03-20 11:19:28.675758148 +0100
54+--- nautilus.orig/libnautilus-private/nautilus-progress-info.h 2013-09-10 16:35:50.976648305 +0200
55++++ nautilus/libnautilus-private/nautilus-progress-info.h 2013-09-10 16:36:15.744336935 +0200
56 @@ -62,6 +62,8 @@
57 gboolean nautilus_progress_info_get_is_started (NautilusProgressInfo *info);
58 gboolean nautilus_progress_info_get_is_finished (NautilusProgressInfo *info);
59@@ -128,10 +128,10 @@
60
61 void nautilus_progress_info_start (NautilusProgressInfo *info);
62 void nautilus_progress_info_finish (NautilusProgressInfo *info);
63-Index: nautilus-3.3.92/src/Makefile.am
64+Index: nautilus/src/Makefile.am
65 ===================================================================
66---- nautilus-3.3.92.orig/src/Makefile.am 2012-03-20 11:19:28.539758142 +0100
67-+++ nautilus-3.3.92/src/Makefile.am 2012-03-20 11:19:28.675758148 +0100
68+--- nautilus.orig/src/Makefile.am 2013-09-10 16:36:15.588338896 +0200
69++++ nautilus/src/Makefile.am 2013-09-10 16:36:15.744336935 +0200
70 @@ -30,6 +30,7 @@
71 -DSYSCONFDIR=\""$(sysconfdir)"\" \
72 -DVERSION="\"$(VERSION)\"" \
73@@ -159,10 +159,10 @@
74 $(NULL)
75
76 nodist_nautilus_SOURCES = \
77-Index: nautilus-3.3.92/src/nautilus-progress-ui-handler.c
78+Index: nautilus/src/nautilus-progress-ui-handler.c
79 ===================================================================
80---- nautilus-3.3.92.orig/src/nautilus-progress-ui-handler.c 2012-03-20 11:19:28.655758148 +0100
81-+++ nautilus-3.3.92/src/nautilus-progress-ui-handler.c 2012-03-20 11:19:28.679758148 +0100
82+--- nautilus.orig/src/nautilus-progress-ui-handler.c 2013-09-10 16:36:15.724337185 +0200
83++++ nautilus/src/nautilus-progress-ui-handler.c 2013-09-10 16:36:28.312178942 +0200
84 @@ -38,6 +38,11 @@
85
86 #include <libnotify/notify.h>
87@@ -185,7 +185,7 @@
88 };
89
90 G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT);
91-@@ -181,6 +189,208 @@
92+@@ -181,6 +189,206 @@
93 gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
94 }
95
96@@ -246,12 +246,10 @@
97 +{
98 + g_return_if_fail (self);
99 +
100-+ if (!gtk_widget_get_visible (self->priv->progress_window)) {
101-+ gtk_window_present (GTK_WINDOW (self->priv->progress_window));
102-+ } else {
103-+ gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), TRUE);
104-+ gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), FALSE);
105-+ }
106++ GtkWindow *window = self->priv->progress_window;
107++ GdkWindow *gwindow = gtk_widget_get_window (GTK_WIDGET (window));
108++ guint32 server_time = gdk_x11_get_server_time (gwindow);
109++ gtk_window_present_with_time (GTK_WINDOW (window), server_time);
110 +}
111 +
112 +static void
113@@ -394,7 +392,7 @@
114 static gboolean
115 progress_window_delete_event (GtkWidget *widget,
116 GdkEvent *event,
117-@@ -313,6 +522,10 @@
118+@@ -313,6 +521,10 @@
119 progress_ui_handler_show_complete_notification (self);
120 }
121 }
122@@ -405,7 +403,7 @@
123 }
124
125 static void
126-@@ -335,6 +548,10 @@
127+@@ -335,6 +547,10 @@
128 progress_ui_handler_update_notification_or_status (self);
129 }
130 }
131@@ -416,10 +414,10 @@
132 }
133
134 typedef struct {
135-Index: nautilus-3.3.92/src/unity-quicklist-handler.c
136+Index: nautilus/src/unity-quicklist-handler.c
137 ===================================================================
138 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
139-+++ nautilus-3.3.92/src/unity-quicklist-handler.c 2012-03-20 11:19:28.679758148 +0100
140++++ nautilus/src/unity-quicklist-handler.c 2013-09-10 16:36:15.748336884 +0200
141 @@ -0,0 +1,156 @@
142 +/*unity-quicklist-handler.c: handle Unity quicklists
143 + *
144@@ -577,10 +575,10 @@
145 + return g_object_new (UNITY_TYPE_QUICKLIST_HANDLER, NULL);
146 +}
147 +
148-Index: nautilus-3.3.92/src/unity-quicklist-handler.h
149+Index: nautilus/src/unity-quicklist-handler.h
150 ===================================================================
151 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
152-+++ nautilus-3.3.92/src/unity-quicklist-handler.h 2012-03-20 11:19:28.683758148 +0100
153++++ nautilus/src/unity-quicklist-handler.h 2013-09-10 16:36:15.748336884 +0200
154 @@ -0,0 +1,73 @@
155 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
156 +/*
157@@ -655,10 +653,10 @@
158 +#define UNITY_QUICKLIST_CANCEL_COPY _("Cancel All In-progress Actions")
159 +
160 +#endif /* __UNITY_QUICKLIST_HANDLER_H__ */
161-Index: nautilus-3.3.92/src/nautilus-application.c
162+Index: nautilus/src/nautilus-application.c
163 ===================================================================
164---- nautilus-3.3.92.orig/src/nautilus-application.c 2012-02-06 20:44:45.000000000 +0100
165-+++ nautilus-3.3.92/src/nautilus-application.c 2012-03-20 11:19:28.683758148 +0100
166+--- nautilus.orig/src/nautilus-application.c 2013-09-10 16:35:51.024647703 +0200
167++++ nautilus/src/nautilus-application.c 2013-09-10 16:36:15.748336884 +0200
168 @@ -77,6 +77,10 @@
169 #include <gdk/gdkx.h>
170 #include <gtk/gtk.h>
171@@ -681,10 +679,10 @@
172 }
173
174 static void
175-Index: nautilus-3.3.92/src/unity-bookmarks-handler.c
176+Index: nautilus/src/unity-bookmarks-handler.c
177 ===================================================================
178 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
179-+++ nautilus-3.5.1/src/unity-bookmarks-handler.c 2012-05-22 08:52:17 +0000
180++++ nautilus/src/unity-bookmarks-handler.c 2013-09-10 16:36:15.748336884 +0200
181 @@ -0,0 +1,137 @@
182 +/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist
183 + *
184@@ -823,10 +821,10 @@
185 + G_CALLBACK (unity_bookmarks_handler_refresh_bookmarks), 0);
186 +}
187 +
188-Index: nautilus-3.3.92/src/unity-bookmarks-handler.h
189+Index: nautilus/src/unity-bookmarks-handler.h
190 ===================================================================
191 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
192-+++ nautilus-3.3.92/src/unity-bookmarks-handler.h 2012-03-20 11:19:28.687758148 +0100
193++++ nautilus/src/unity-bookmarks-handler.h 2013-09-10 16:36:15.748336884 +0200
194 @@ -0,0 +1,31 @@
195 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
196 +/*
197@@ -859,10 +857,10 @@
198 +void unity_bookmarks_handler_initialize (void);
199 +
200 +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/
201-Index: nautilus-3.3.92/po/POTFILES.in
202+Index: nautilus/po/POTFILES.in
203 ===================================================================
204---- nautilus-3.3.92.orig/po/POTFILES.in 2012-03-20 11:19:28.495758139 +0100
205-+++ nautilus-3.3.92/po/POTFILES.in 2012-03-20 11:19:37.203758560 +0100
206+--- nautilus.orig/po/POTFILES.in 2013-09-10 16:36:15.492340102 +0200
207++++ nautilus/po/POTFILES.in 2013-09-10 16:36:15.748336884 +0200
208 @@ -90,3 +90,4 @@
209 src/nautilus-window-private.h
210 src/nautilus-window-slot.c

Subscribers

People subscribed via source and target branches