Nautilus

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

  1. progress-ql-present-fix
  2. Merge into precise
Proposed by Marco Trevisan (Treviño)
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 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
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-08 18:04:23 +0000
+++ debian/changelog 2013-09-10 14:52:33 +0000
@@ -1,3 +1,10 @@
1nautilus (1:3.4.2-0ubuntu9) precise; urgency=low
2
3 * debian/patches/12_unity_launcher_support.patch:
4 - Present the transfer window with server timestamp (lp: #887821)
5
6 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Tue, 10 Sep 2013 16:28:29 +0200
7
1nautilus (1:3.4.2-0ubuntu8) precise; urgency=low8nautilus (1:3.4.2-0ubuntu8) precise; urgency=low
29
3 * debian/patches/git_fix_touch_double_click.patch: upstream patch to try 10 * debian/patches/git_fix_touch_double_click.patch: upstream patch to try
411
=== modified file 'debian/patches/12_unity_launcher_support.patch'
--- debian/patches/12_unity_launcher_support.patch 2012-06-01 06:11:40 +0000
+++ debian/patches/12_unity_launcher_support.patch 2013-09-10 14:52:33 +0000
@@ -1,8 +1,8 @@
1=== modified file 'configure.in'1=== modified file 'configure.in'
2Index: nautilus-3.3.92/configure.in2Index: nautilus/configure.in
3===================================================================3===================================================================
4--- nautilus-3.3.92.orig/configure.in 2012-03-20 11:19:28.411758136 +01004--- nautilus.orig/configure.in 2013-09-10 16:36:15.464340455 +0200
5+++ nautilus-3.3.92/configure.in 2012-03-20 11:19:28.671758147 +01005+++ nautilus/configure.in 2013-09-10 16:36:15.744336935 +0200
6@@ -10,6 +10,8 @@6@@ -10,6 +10,8 @@
7 m4_define(exif_minver, 0.6.20)7 m4_define(exif_minver, 0.6.20)
8 m4_define(exempi_minver, 2.1.0)8 m4_define(exempi_minver, 2.1.0)
@@ -50,10 +50,10 @@
50 nautilus-sendto ext: $enable_nst_extension50 nautilus-sendto ext: $enable_nst_extension
51 Tracker support: $build_tracker51 Tracker support: $build_tracker
52 52
53Index: nautilus-3.3.92/libnautilus-private/nautilus-progress-info.c53Index: nautilus/libnautilus-private/nautilus-progress-info.c
54===================================================================54===================================================================
55--- nautilus-3.3.92.orig/libnautilus-private/nautilus-progress-info.c 2012-02-06 20:44:45.000000000 +010055--- nautilus.orig/libnautilus-private/nautilus-progress-info.c 2013-09-10 16:35:51.004647954 +0200
56+++ nautilus-3.3.92/libnautilus-private/nautilus-progress-info.c 2012-03-20 11:19:28.675758148 +010056+++ nautilus/libnautilus-private/nautilus-progress-info.c 2013-09-10 16:36:15.744336935 +0200
57@@ -52,6 +52,8 @@57@@ -52,6 +52,8 @@
58 char *status;58 char *status;
59 char *details;59 char *details;
@@ -115,10 +115,10 @@
115 info->progress_at_idle = TRUE;115 info->progress_at_idle = TRUE;
116 queue_idle (info, FALSE);116 queue_idle (info, FALSE);
117 }117 }
118Index: nautilus-3.3.92/libnautilus-private/nautilus-progress-info.h118Index: nautilus/libnautilus-private/nautilus-progress-info.h
119===================================================================119===================================================================
120--- nautilus-3.3.92.orig/libnautilus-private/nautilus-progress-info.h 2011-07-31 20:29:17.000000000 +0200120--- nautilus.orig/libnautilus-private/nautilus-progress-info.h 2013-09-10 16:35:50.976648305 +0200
121+++ nautilus-3.3.92/libnautilus-private/nautilus-progress-info.h 2012-03-20 11:19:28.675758148 +0100121+++ nautilus/libnautilus-private/nautilus-progress-info.h 2013-09-10 16:36:15.744336935 +0200
122@@ -62,6 +62,8 @@122@@ -62,6 +62,8 @@
123 gboolean nautilus_progress_info_get_is_started (NautilusProgressInfo *info);123 gboolean nautilus_progress_info_get_is_started (NautilusProgressInfo *info);
124 gboolean nautilus_progress_info_get_is_finished (NautilusProgressInfo *info);124 gboolean nautilus_progress_info_get_is_finished (NautilusProgressInfo *info);
@@ -128,10 +128,10 @@
128 128
129 void nautilus_progress_info_start (NautilusProgressInfo *info);129 void nautilus_progress_info_start (NautilusProgressInfo *info);
130 void nautilus_progress_info_finish (NautilusProgressInfo *info);130 void nautilus_progress_info_finish (NautilusProgressInfo *info);
131Index: nautilus-3.3.92/src/Makefile.am131Index: nautilus/src/Makefile.am
132===================================================================132===================================================================
133--- nautilus-3.3.92.orig/src/Makefile.am 2012-03-20 11:19:28.539758142 +0100133--- nautilus.orig/src/Makefile.am 2013-09-10 16:36:15.588338896 +0200
134+++ nautilus-3.3.92/src/Makefile.am 2012-03-20 11:19:28.675758148 +0100134+++ nautilus/src/Makefile.am 2013-09-10 16:36:15.744336935 +0200
135@@ -30,6 +30,7 @@135@@ -30,6 +30,7 @@
136 -DSYSCONFDIR=\""$(sysconfdir)"\" \136 -DSYSCONFDIR=\""$(sysconfdir)"\" \
137 -DVERSION="\"$(VERSION)\"" \137 -DVERSION="\"$(VERSION)\"" \
@@ -159,10 +159,10 @@
159 $(NULL)159 $(NULL)
160 160
161 nodist_nautilus_SOURCES = \161 nodist_nautilus_SOURCES = \
162Index: nautilus-3.3.92/src/nautilus-progress-ui-handler.c162Index: nautilus/src/nautilus-progress-ui-handler.c
163===================================================================163===================================================================
164--- nautilus-3.3.92.orig/src/nautilus-progress-ui-handler.c 2012-03-20 11:19:28.655758148 +0100164--- nautilus.orig/src/nautilus-progress-ui-handler.c 2013-09-10 16:36:15.724337185 +0200
165+++ nautilus-3.3.92/src/nautilus-progress-ui-handler.c 2012-03-20 11:19:28.679758148 +0100165+++ nautilus/src/nautilus-progress-ui-handler.c 2013-09-10 16:36:28.312178942 +0200
166@@ -38,6 +38,11 @@166@@ -38,6 +38,11 @@
167 167
168 #include <libnotify/notify.h>168 #include <libnotify/notify.h>
@@ -185,7 +185,7 @@
185 };185 };
186 186
187 G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT);187 G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT);
188@@ -181,6 +189,208 @@188@@ -181,6 +189,206 @@
189 gtk_status_icon_set_visible (self->priv->status_icon, TRUE);189 gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
190 }190 }
191 191
@@ -246,12 +246,10 @@
246+{246+{
247+ g_return_if_fail (self);247+ g_return_if_fail (self);
248+248+
249+ if (!gtk_widget_get_visible (self->priv->progress_window)) {249+ GtkWindow *window = self->priv->progress_window;
250+ gtk_window_present (GTK_WINDOW (self->priv->progress_window));250+ GdkWindow *gwindow = gtk_widget_get_window (GTK_WIDGET (window));
251+ } else {251+ guint32 server_time = gdk_x11_get_server_time (gwindow);
252+ gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), TRUE);252+ gtk_window_present_with_time (GTK_WINDOW (window), server_time);
253+ gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), FALSE);
254+ }
255+}253+}
256+254+
257+static void255+static void
@@ -394,7 +392,7 @@
394 static gboolean392 static gboolean
395 progress_window_delete_event (GtkWidget *widget,393 progress_window_delete_event (GtkWidget *widget,
396 GdkEvent *event,394 GdkEvent *event,
397@@ -313,6 +522,10 @@395@@ -313,6 +521,10 @@
398 progress_ui_handler_show_complete_notification (self);396 progress_ui_handler_show_complete_notification (self);
399 }397 }
400 }398 }
@@ -405,7 +403,7 @@
405 }403 }
406 404
407 static void405 static void
408@@ -335,6 +548,10 @@406@@ -335,6 +547,10 @@
409 progress_ui_handler_update_notification_or_status (self);407 progress_ui_handler_update_notification_or_status (self);
410 }408 }
411 }409 }
@@ -416,10 +414,10 @@
416 }414 }
417 415
418 typedef struct {416 typedef struct {
419Index: nautilus-3.3.92/src/unity-quicklist-handler.c417Index: nautilus/src/unity-quicklist-handler.c
420===================================================================418===================================================================
421--- /dev/null 1970-01-01 00:00:00.000000000 +0000419--- /dev/null 1970-01-01 00:00:00.000000000 +0000
422+++ nautilus-3.3.92/src/unity-quicklist-handler.c 2012-03-20 11:19:28.679758148 +0100420+++ nautilus/src/unity-quicklist-handler.c 2013-09-10 16:36:15.748336884 +0200
423@@ -0,0 +1,156 @@421@@ -0,0 +1,156 @@
424+/*unity-quicklist-handler.c: handle Unity quicklists422+/*unity-quicklist-handler.c: handle Unity quicklists
425+ *423+ *
@@ -577,10 +575,10 @@
577+ return g_object_new (UNITY_TYPE_QUICKLIST_HANDLER, NULL);575+ return g_object_new (UNITY_TYPE_QUICKLIST_HANDLER, NULL);
578+}576+}
579+577+
580Index: nautilus-3.3.92/src/unity-quicklist-handler.h578Index: nautilus/src/unity-quicklist-handler.h
581===================================================================579===================================================================
582--- /dev/null 1970-01-01 00:00:00.000000000 +0000580--- /dev/null 1970-01-01 00:00:00.000000000 +0000
583+++ nautilus-3.3.92/src/unity-quicklist-handler.h 2012-03-20 11:19:28.683758148 +0100581+++ nautilus/src/unity-quicklist-handler.h 2013-09-10 16:36:15.748336884 +0200
584@@ -0,0 +1,73 @@582@@ -0,0 +1,73 @@
585+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */583+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
586+/*584+/*
@@ -655,10 +653,10 @@
655+#define UNITY_QUICKLIST_CANCEL_COPY _("Cancel All In-progress Actions")653+#define UNITY_QUICKLIST_CANCEL_COPY _("Cancel All In-progress Actions")
656+654+
657+#endif /* __UNITY_QUICKLIST_HANDLER_H__ */655+#endif /* __UNITY_QUICKLIST_HANDLER_H__ */
658Index: nautilus-3.3.92/src/nautilus-application.c656Index: nautilus/src/nautilus-application.c
659===================================================================657===================================================================
660--- nautilus-3.3.92.orig/src/nautilus-application.c 2012-02-06 20:44:45.000000000 +0100658--- nautilus.orig/src/nautilus-application.c 2013-09-10 16:35:51.024647703 +0200
661+++ nautilus-3.3.92/src/nautilus-application.c 2012-03-20 11:19:28.683758148 +0100659+++ nautilus/src/nautilus-application.c 2013-09-10 16:36:15.748336884 +0200
662@@ -77,6 +77,10 @@660@@ -77,6 +77,10 @@
663 #include <gdk/gdkx.h>661 #include <gdk/gdkx.h>
664 #include <gtk/gtk.h>662 #include <gtk/gtk.h>
@@ -681,10 +679,10 @@
681 }679 }
682 680
683 static void681 static void
684Index: nautilus-3.3.92/src/unity-bookmarks-handler.c682Index: nautilus/src/unity-bookmarks-handler.c
685===================================================================683===================================================================
686--- /dev/null 1970-01-01 00:00:00.000000000 +0000684--- /dev/null 1970-01-01 00:00:00.000000000 +0000
687+++ nautilus-3.5.1/src/unity-bookmarks-handler.c 2012-05-22 08:52:17 +0000685+++ nautilus/src/unity-bookmarks-handler.c 2013-09-10 16:36:15.748336884 +0200
688@@ -0,0 +1,137 @@686@@ -0,0 +1,137 @@
689+/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist687+/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist
690+ *688+ *
@@ -823,10 +821,10 @@
823+ G_CALLBACK (unity_bookmarks_handler_refresh_bookmarks), 0);821+ G_CALLBACK (unity_bookmarks_handler_refresh_bookmarks), 0);
824+}822+}
825+823+
826Index: nautilus-3.3.92/src/unity-bookmarks-handler.h824Index: nautilus/src/unity-bookmarks-handler.h
827===================================================================825===================================================================
828--- /dev/null 1970-01-01 00:00:00.000000000 +0000826--- /dev/null 1970-01-01 00:00:00.000000000 +0000
829+++ nautilus-3.3.92/src/unity-bookmarks-handler.h 2012-03-20 11:19:28.687758148 +0100827+++ nautilus/src/unity-bookmarks-handler.h 2013-09-10 16:36:15.748336884 +0200
830@@ -0,0 +1,31 @@828@@ -0,0 +1,31 @@
831+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */829+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
832+/*830+/*
@@ -859,10 +857,10 @@
859+void unity_bookmarks_handler_initialize (void);857+void unity_bookmarks_handler_initialize (void);
860+858+
861+#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/859+#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/
862Index: nautilus-3.3.92/po/POTFILES.in860Index: nautilus/po/POTFILES.in
863===================================================================861===================================================================
864--- nautilus-3.3.92.orig/po/POTFILES.in 2012-03-20 11:19:28.495758139 +0100862--- nautilus.orig/po/POTFILES.in 2013-09-10 16:36:15.492340102 +0200
865+++ nautilus-3.3.92/po/POTFILES.in 2012-03-20 11:19:37.203758560 +0100863+++ nautilus/po/POTFILES.in 2013-09-10 16:36:15.748336884 +0200
866@@ -90,3 +90,4 @@864@@ -90,3 +90,4 @@
867 src/nautilus-window-private.h865 src/nautilus-window-private.h
868 src/nautilus-window-slot.c866 src/nautilus-window-slot.c

Subscribers

People subscribed via source and target branches