=== modified file 'debian/changelog' --- debian/changelog 2013-03-08 15:56:13 +0000 +++ debian/changelog 2013-03-12 14:59:21 +0000 @@ -1,3 +1,11 @@ +nautilus (1:3.6.3-0ubuntu9) UNRELEASED; urgency=low + + * debian/patches/12_unity_launcher_support.patch: + - Quicklist entries to show the copy dialog should use a separator (lp: #1154109) + - Transfer dialog should be presented using the correct timestamp (lp: #1154111) + + -- Marco Trevisan (Treviño) Tue, 12 Mar 2013 15:31:21 +0100 + nautilus (1:3.6.3-0ubuntu8) raring; urgency=low * debian/control.in: === modified file 'debian/patches/12_unity_launcher_support.patch' --- debian/patches/12_unity_launcher_support.patch 2012-10-31 07:02:17 +0000 +++ debian/patches/12_unity_launcher_support.patch 2013-03-12 14:59:21 +0000 @@ -1,8 +1,8 @@ === modified file 'configure.in' -Index: nautilus-3.6.2/configure.in +Index: nautilus/configure.in =================================================================== ---- nautilus-3.6.2.orig/configure.in 2012-10-31 02:33:43.228876867 -0400 -+++ nautilus-3.6.2/configure.in 2012-10-31 02:34:01.976876084 -0400 +--- nautilus.orig/configure.in 2013-03-12 13:29:48.958239697 +0100 ++++ nautilus/configure.in 2013-03-12 13:29:48.950239703 +0100 @@ -10,6 +10,8 @@ m4_define(exif_minver, 0.6.20) m4_define(exempi_minver, 2.1.0) @@ -50,10 +50,10 @@ nautilus-sendto ext: $enable_nst_extension Tracker support: $enable_tracker -Index: nautilus-3.6.2/libnautilus-private/nautilus-progress-info.c +Index: nautilus/libnautilus-private/nautilus-progress-info.c =================================================================== ---- nautilus-3.6.2.orig/libnautilus-private/nautilus-progress-info.c 2012-10-31 02:33:43.228876867 -0400 -+++ nautilus-3.6.2/libnautilus-private/nautilus-progress-info.c 2012-10-31 02:34:01.976876084 -0400 +--- nautilus.orig/libnautilus-private/nautilus-progress-info.c 2013-03-12 13:29:48.958239697 +0100 ++++ nautilus/libnautilus-private/nautilus-progress-info.c 2013-03-12 13:29:48.950239703 +0100 @@ -52,6 +52,8 @@ char *status; char *details; @@ -115,10 +115,10 @@ info->progress_at_idle = TRUE; queue_idle (info, FALSE); } -Index: nautilus-3.6.2/libnautilus-private/nautilus-progress-info.h +Index: nautilus/libnautilus-private/nautilus-progress-info.h =================================================================== ---- nautilus-3.6.2.orig/libnautilus-private/nautilus-progress-info.h 2012-10-31 02:33:43.228876867 -0400 -+++ nautilus-3.6.2/libnautilus-private/nautilus-progress-info.h 2012-10-31 02:34:01.980876084 -0400 +--- nautilus.orig/libnautilus-private/nautilus-progress-info.h 2013-03-12 13:29:48.958239697 +0100 ++++ nautilus/libnautilus-private/nautilus-progress-info.h 2013-03-12 13:29:48.950239703 +0100 @@ -62,6 +62,8 @@ gboolean nautilus_progress_info_get_is_started (NautilusProgressInfo *info); gboolean nautilus_progress_info_get_is_finished (NautilusProgressInfo *info); @@ -128,10 +128,10 @@ void nautilus_progress_info_start (NautilusProgressInfo *info); void nautilus_progress_info_finish (NautilusProgressInfo *info); -Index: nautilus-3.6.2/src/Makefile.am +Index: nautilus/src/Makefile.am =================================================================== ---- nautilus-3.6.2.orig/src/Makefile.am 2012-10-31 02:33:43.228876867 -0400 -+++ nautilus-3.6.2/src/Makefile.am 2012-10-31 02:34:01.980876084 -0400 +--- nautilus.orig/src/Makefile.am 2013-03-12 13:29:48.958239697 +0100 ++++ nautilus/src/Makefile.am 2013-03-12 13:29:48.950239703 +0100 @@ -31,6 +31,7 @@ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DVERSION="\"$(VERSION)\"" \ @@ -159,10 +159,10 @@ $(NULL) nodist_nautilus_SOURCES = \ -Index: nautilus-3.6.2/src/nautilus-progress-ui-handler.c +Index: nautilus/src/nautilus-progress-ui-handler.c =================================================================== ---- nautilus-3.6.2.orig/src/nautilus-progress-ui-handler.c 2012-10-31 02:33:43.228876867 -0400 -+++ nautilus-3.6.2/src/nautilus-progress-ui-handler.c 2012-10-31 02:34:01.980876084 -0400 +--- nautilus.orig/src/nautilus-progress-ui-handler.c 2013-03-12 13:29:48.958239697 +0100 ++++ nautilus/src/nautilus-progress-ui-handler.c 2013-03-12 15:25:31.435572751 +0100 @@ -38,6 +38,11 @@ #include @@ -185,7 +185,7 @@ }; G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT); -@@ -181,6 +189,208 @@ +@@ -181,6 +189,221 @@ gtk_status_icon_set_visible (self->priv->status_icon, TRUE); } @@ -246,12 +246,7 @@ +{ + g_return_if_fail (self); + -+ if (!gtk_widget_get_visible (self->priv->progress_window)) { -+ gtk_window_present (GTK_WINDOW (self->priv->progress_window)); -+ } else { -+ gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), TRUE); -+ gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), FALSE); -+ } ++ gtk_window_present_with_time (GTK_WINDOW (self->priv->progress_window), timestamp); +} + +static void @@ -279,28 +274,46 @@ + + for (l = unity_quicklist_get_launcher_entries (self->priv->unity_quicklist_handler); l; l = l->next) { + UnityLauncherEntry *entry = l->data; -+ -+ DbusmenuMenuitem *quickmenu = dbusmenu_menuitem_new (); ++ DbusmenuMenuitem *ql = unity_launcher_entry_get_quicklist (entry); ++ DbusmenuMenuitem *quickmenu; ++ ++ if (ql) { ++ quickmenu = dbusmenu_menuitem_new (); ++ dbusmenu_menuitem_property_set (quickmenu, ++ DBUSMENU_MENUITEM_PROP_TYPE, ++ DBUSMENU_CLIENT_TYPES_SEPARATOR); ++ dbusmenu_menuitem_property_set_bool (quickmenu, ++ DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); ++ dbusmenu_menuitem_property_set_bool (quickmenu, ++ UNITY_QUICKLIST_PROGRESS_ITEM, TRUE); ++ unity_quicklist_handler_append_menuitem (entry, quickmenu); ++ } ++ ++ quickmenu = dbusmenu_menuitem_new (); + dbusmenu_menuitem_property_set (quickmenu, + DBUSMENU_MENUITEM_PROP_LABEL, -+ UNITY_QUICKLIST_SHOW_COPY_DIALOG); ++ UNITY_QUICKLIST_SHOW_COPY_DIALOG); + dbusmenu_menuitem_property_set_bool (quickmenu, + DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); ++ dbusmenu_menuitem_property_set_bool (quickmenu, ++ UNITY_QUICKLIST_PROGRESS_ITEM, TRUE); + unity_quicklist_handler_append_menuitem (entry, quickmenu); + g_signal_connect (quickmenu, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, + (GCallback) progress_ui_handler_unity_quicklist_show_activated, -+ self); ++ self); + + quickmenu = dbusmenu_menuitem_new (); + dbusmenu_menuitem_property_set (quickmenu, -+ DBUSMENU_MENUITEM_PROP_LABEL, -+ UNITY_QUICKLIST_CANCEL_COPY); ++ DBUSMENU_MENUITEM_PROP_LABEL, ++ UNITY_QUICKLIST_CANCEL_COPY); + dbusmenu_menuitem_property_set_bool (quickmenu, + DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE); ++ dbusmenu_menuitem_property_set_bool (quickmenu, ++ UNITY_QUICKLIST_PROGRESS_ITEM, TRUE); + unity_quicklist_handler_append_menuitem (entry, quickmenu); + g_signal_connect (quickmenu, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, + (GCallback) progress_ui_handler_unity_quicklist_cancel_activated, -+ self); ++ self); + } +} + @@ -394,7 +407,7 @@ static gboolean progress_window_delete_event (GtkWidget *widget, GdkEvent *event, -@@ -313,6 +523,10 @@ +@@ -313,6 +536,10 @@ progress_ui_handler_show_complete_notification (self); } } @@ -405,7 +418,7 @@ } static void -@@ -335,6 +549,10 @@ +@@ -335,6 +562,10 @@ progress_ui_handler_update_notification_or_status (self); } } @@ -416,11 +429,11 @@ } typedef struct { -Index: nautilus-3.6.2/src/unity-quicklist-handler.c +Index: nautilus/src/unity-quicklist-handler.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ nautilus-3.6.2/src/unity-quicklist-handler.c 2012-10-31 02:34:01.980876084 -0400 -@@ -0,0 +1,156 @@ ++++ nautilus/src/unity-quicklist-handler.c 2013-03-12 14:07:43.835192621 +0100 +@@ -0,0 +1,153 @@ +/*unity-quicklist-handler.c: handle Unity quicklists + * + * Copyright (C) 2012 Canonical @@ -466,10 +479,7 @@ +unity_quicklist_handler_menuitem_is_progress_item (DbusmenuMenuitem *ql) +{ + g_return_val_if_fail(ql, FALSE); -+ const gchar *label = dbusmenu_menuitem_property_get (ql, DBUSMENU_MENUITEM_PROP_LABEL); -+ -+ return ((g_strcmp0 (label, (const gchar*)UNITY_QUICKLIST_SHOW_COPY_DIALOG) == 0) || -+ (g_strcmp0 (label, (const gchar*)UNITY_QUICKLIST_CANCEL_COPY) == 0)); ++ return dbusmenu_menuitem_property_get_bool (ql, UNITY_QUICKLIST_PROGRESS_ITEM); +} + +gboolean @@ -577,11 +587,11 @@ + return g_object_new (UNITY_TYPE_QUICKLIST_HANDLER, NULL); +} + -Index: nautilus-3.6.2/src/unity-quicklist-handler.h +Index: nautilus/src/unity-quicklist-handler.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ nautilus-3.6.2/src/unity-quicklist-handler.h 2012-10-31 02:34:01.980876084 -0400 -@@ -0,0 +1,73 @@ ++++ nautilus/src/unity-quicklist-handler.h 2013-03-12 14:07:14.835176946 +0100 +@@ -0,0 +1,75 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* + * unity-quicklist.h: handle unity quicklists. @@ -630,6 +640,8 @@ + +typedef struct _UnityQuicklistHandlerPriv UnityQuicklistHandlerPriv; + ++#define UNITY_QUICKLIST_PROGRESS_ITEM "unity-quicklist-progress-item" ++ +typedef struct { + GObject parent; + @@ -655,10 +667,10 @@ +#define UNITY_QUICKLIST_CANCEL_COPY _("Cancel All In-progress Actions") + +#endif /* __UNITY_QUICKLIST_HANDLER_H__ */ -Index: nautilus-3.6.2/src/nautilus-application.c +Index: nautilus/src/nautilus-application.c =================================================================== ---- nautilus-3.6.2.orig/src/nautilus-application.c 2012-10-31 02:33:43.228876867 -0400 -+++ nautilus-3.6.2/src/nautilus-application.c 2012-10-31 02:34:01.980876084 -0400 +--- nautilus.orig/src/nautilus-application.c 2013-03-12 13:29:48.958239697 +0100 ++++ nautilus/src/nautilus-application.c 2013-03-12 13:29:48.954239700 +0100 @@ -79,6 +79,10 @@ #include #include @@ -681,10 +693,10 @@ } static void -Index: nautilus-3.6.2/src/unity-bookmarks-handler.c +Index: nautilus/src/unity-bookmarks-handler.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ nautilus-3.6.2/src/unity-bookmarks-handler.c 2012-10-31 02:34:01.980876084 -0400 ++++ nautilus/src/unity-bookmarks-handler.c 2013-03-12 13:29:48.954239700 +0100 @@ -0,0 +1,137 @@ +/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist + * @@ -823,10 +835,10 @@ + G_CALLBACK (unity_bookmarks_handler_refresh_bookmarks), 0); +} + -Index: nautilus-3.6.2/src/unity-bookmarks-handler.h +Index: nautilus/src/unity-bookmarks-handler.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ nautilus-3.6.2/src/unity-bookmarks-handler.h 2012-10-31 02:34:01.980876084 -0400 ++++ nautilus/src/unity-bookmarks-handler.h 2013-03-12 13:29:48.954239700 +0100 @@ -0,0 +1,31 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* @@ -859,10 +871,10 @@ +void unity_bookmarks_handler_initialize (void); + +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/ -Index: nautilus-3.6.2/po/POTFILES.in +Index: nautilus/po/POTFILES.in =================================================================== ---- nautilus-3.6.2.orig/po/POTFILES.in 2012-10-31 02:33:43.228876867 -0400 -+++ nautilus-3.6.2/po/POTFILES.in 2012-10-31 02:34:01.980876084 -0400 +--- nautilus.orig/po/POTFILES.in 2013-03-12 13:29:48.958239697 +0100 ++++ nautilus/po/POTFILES.in 2013-03-12 13:29:48.954239700 +0100 @@ -90,3 +90,4 @@ src/nautilus-window-private.h src/nautilus-window-slot.c