Merge lp:~darkxst/ubuntu/trusty/nautilus/310c into lp:~ubuntu-desktop/nautilus/ubuntu

[Tim Lunn]

Update to 3.10

Have added a patch to disable client side decorations for non-GNOME sessions. Nautilus is not using the GtkHeaderBar API so this is the only way!

Also fixed theming issues with buttons and header-bar corners, one last issue is the square left edge of home button in pathbar when its the only button

[Sebastien Bacher (seb128)]

Thanks for the work but we said we wouldn't start updating GNOME component to 3.10 this cycle. The reason is not only CSD but also stabilization and staying on versions we ran enough to know their bugs/issues.

The diffstat is non trivial there, could you summarize the changes and the motivation to go with the update?

review: Needs Information

[Tim Lunn (darkxst)]

Hi Seb,
  So largely there were no major features added or removed during this cycle. It was mostly

1. Port to the CSD
2. Places Sidebar was merged into gtk+, most of the diff is just accounting for this slight renaming of API using the new widget etc and subsequent removal of code from nautilus.
3. The rest was mostly bug fixes, I believe atleast one of the top crashers might also be fixed.

Apart from the CSD, The UI is more or less unchanged compared to 3.8. I think compared to previous nautilus release I think this was should be fairly safe with minimal risk of the regressions.

The main reason ubuntu GNOME would like this update for the CSD

[Sebastien Bacher (seb128)]

Thanks for the details, I've just tested it, it looks mostly fine but the toolbar needs fixing, its icons are too small with padding that shouldn't be there, http://ubuntuone.com/5CDyRasgb2yp3Ak9tRGNaX

Could you have a look to that?

review: Needs Fixing

[Sebastien Bacher (seb128)]

Using the default theme is also some white pixels between the toolbar and the wm decoration, likely the round corners for CSD? see http://ubuntuone.com/1QwHezAjewqTsD7QSfQjQN

[lp:~darkxst/ubuntu/trusty/nautilus/310c]

414. By Tim Lunn on 2014-01-24

fix spacing error

[Sebastien Bacher (seb128)]

Thank you for your work, there is an issue though, git_rubberbands_color.patch fails to apply when trying to bzr bd-do... in fact it seems you forgot to actual drop the git_ from that vcs (they are not in the diff and still in the debian dir and in the series)?

Could you also add some headers to the new patches to explain them/maybe upstream the fixes (or at least report a bug about the issue)?

review: Needs Fixing

[lp:~darkxst/ubuntu/trusty/nautilus/310c]

415. By Tim Lunn on 2014-01-24

fix merge

416. By Tim Lunn on 2014-01-24

remove another git patch, and add missing one

417. By Tim Lunn on 2014-01-25

ubuntu_titlebar_css.patch, theme fixes (LP: #1272602)

rework theme fixes slightly

418. By Tim Lunn on 2014-01-25

bring back another patch

419. By Tim Lunn on 2014-01-25

another missing patch

[Tim Lunn (darkxst)]

Seb, nautilus should be ported to GtkHeaderBar proper for 3.12, so I think its unlikely they would take the changes.

[Sebastien Bacher (seb128)]

Not sure why some patches are displayed as removed and added back but the result seems fine, thanks!

> Seb, nautilus should be ported to GtkHeaderBar proper for 3.12, so I think its unlikely they would take the changes.

It would still be good to have a bug report about the issue. They might want to fix the issue in the 3.10 serie, and they can close the bug with a "fixed in 3.12 with GtkHeaderBar proper use" if that's the case.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-22 02:10:36 +0000
+++ debian/changelog	2014-01-25 02:17:44 +0000
@@ -1,3 +1,17 @@
+nautilus (1:3.10.1-0ubuntu1~trusty1) trusty; urgency=medium
+
+  * New upstream release
+  * debian/control.in: bump depend on gtk+ 3.9.11
+  * debian/patches:
+    - Dropped git patches, that are included in new version
+    - 06_never_exec_nonexec_launchers.patch, refreshed
+    - disconnect-extra-location-widgets.patch, dropped included in new version
+    - 16_unity_new_documents.patch, refreshed
+    - ubuntu_show_titlebar.patch, disable CSD titlebar on non-GNOME sessions
+    - ubuntu_titlebar_css.patch, theme fixes (LP: #1272602)
+
+ -- Tim Lunn <[e-mail]>  Thu, 02 Jan 2014 16:50:06 +1100
+
 nautilus (1:3.8.2-0ubuntu11) trusty; urgency=medium
 
   * debian/patches/interactive_search.patch:

=== modified file 'debian/control.in'
--- debian/control.in	2013-06-10 20:29:36 +0000
+++ debian/control.in	2014-01-25 02:17:44 +0000
@@ -11,7 +11,7 @@
                gnome-pkg-tools (>= 0.13),
                libglib2.0-dev (>= 2.35.3),
                libatk1.0-dev (>= 1.32.0),
-               libgtk-3-dev (>= 3.7.7),
+               libgtk-3-dev (>= 3.9.11),
                libgail-3-dev,
                libgnome-desktop-3-dev (>= 3.0.0),
                libxml2-dev (>= 2.7.8),

=== modified file 'debian/patches/06_never_exec_nonexec_launchers.patch'
--- debian/patches/06_never_exec_nonexec_launchers.patch	2014-01-15 01:39:50 +0000
+++ debian/patches/06_never_exec_nonexec_launchers.patch	2014-01-25 02:17:44 +0000
@@ -3,10 +3,8 @@
  https://wiki.ubuntu.com/SecurityTeam/Policies#Execute-Permission%20Bit%20Required
 Author: Kees Cook <[e-mail]>
 
-Index: nautilus-3.8.2/src/nautilus-mime-actions.c
-===================================================================
---- nautilus-3.8.2.orig/src/nautilus-mime-actions.c	2014-01-15 14:31:34.285606087 +1300
-+++ nautilus-3.8.2/src/nautilus-mime-actions.c	2014-01-15 14:31:34.281606087 +1300
+--- a/src/nautilus-mime-actions.c
++++ b/src/nautilus-mime-actions.c
 @@ -1586,12 +1586,14 @@
  			      "text", primary,
  			      "secondary-text", secondary,
@@ -20,5 +18,5 @@
  		}
 +		*/
  		gtk_dialog_add_button (GTK_DIALOG (dialog),
- 				       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ 				       _("_Cancel"), GTK_RESPONSE_CANCEL);
  		gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);

=== modified file 'debian/patches/16_unity_new_documents.patch'
--- debian/patches/16_unity_new_documents.patch	2014-01-15 01:39:50 +0000
+++ debian/patches/16_unity_new_documents.patch	2014-01-25 02:17:44 +0000
@@ -1,7 +1,6 @@
-Index: nautilus-3.8.2/src/nautilus-actions.h
-===================================================================
---- nautilus-3.8.2.orig/src/nautilus-actions.h	2014-01-15 14:31:43.065605783 +1300
-+++ nautilus-3.8.2/src/nautilus-actions.h	2014-01-15 14:31:43.057605783 +1300
+diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-actions.h nautilus-3.8.2/src/nautilus-actions.h
+--- nautilus-3.8.2.orig/src/nautilus-actions.h	2013-06-21 13:50:33.936456773 +0200
++++ nautilus-3.8.2/src/nautilus-actions.h	2013-06-21 13:50:53.108457411 +0200
 @@ -118,6 +118,7 @@
  #define NAUTILUS_ACTION_SCRIPTS "Scripts"
  #define NAUTILUS_ACTION_OPEN_SCRIPTS_FOLDER "Open Scripts Folder"
@@ -10,10 +9,9 @@
  #define NAUTILUS_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
  #define NAUTILUS_ACTION_MANUAL_LAYOUT "Manual Layout"
  #define NAUTILUS_ACTION_REVERSED_ORDER "Reversed Order"
-Index: nautilus-3.8.2/src/nautilus-directory-view-ui.xml
-===================================================================
---- nautilus-3.8.2.orig/src/nautilus-directory-view-ui.xml	2014-01-15 14:31:43.065605783 +1300
-+++ nautilus-3.8.2/src/nautilus-directory-view-ui.xml	2014-01-15 14:31:43.061605783 +1300
+diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-directory-view-ui.xml nautilus-3.8.2/src/nautilus-directory-view-ui.xml
+--- nautilus-3.8.2.orig/src/nautilus-directory-view-ui.xml	2013-06-21 13:50:33.960456773 +0200
++++ nautilus-3.8.2/src/nautilus-directory-view-ui.xml	2013-06-21 13:50:53.108457411 +0200
 @@ -16,6 +16,8 @@
      <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
      <menu action="New Documents">
@@ -32,11 +30,10 @@
        </menu>
      </placeholder>
      <separator name="Clipboard separator"/>
-Index: nautilus-3.8.2/src/nautilus-view.c
-===================================================================
---- nautilus-3.8.2.orig/src/nautilus-view.c	2014-01-15 14:31:43.065605783 +1300
-+++ nautilus-3.8.2/src/nautilus-view.c	2014-01-15 14:31:43.061605783 +1300
-@@ -2107,6 +2107,15 @@
+diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-view.c nautilus-3.8.2/src/nautilus-view.c
+--- nautilus-3.8.2.orig/src/nautilus-view.c	2013-06-21 13:50:33.956456773 +0200
++++ nautilus-3.8.2/src/nautilus-view.c	2013-06-21 13:50:53.120457411 +0200
+@@ -2102,6 +2102,15 @@
  }
  
  static void
@@ -52,7 +49,7 @@
  action_properties_callback (GtkAction *action,
  			    gpointer callback_data)
  {
-@@ -7119,6 +7128,11 @@
+@@ -7114,6 +7123,11 @@
    /* label, accelerator */       N_("New Folder with Selection"), NULL,
    /* tooltip */                  N_("Create a new folder containing the selected items"),
  				 G_CALLBACK (action_new_folder_with_selection_callback) },
@@ -64,7 +61,7 @@
    /* name, stock id */         { NAUTILUS_ACTION_OPEN, NULL,
    /* label, accelerator */       N_("_Open"), "<control>o",
    /* tooltip */                  N_("Open the selected item in this window"),
-@@ -7371,6 +7385,27 @@
+@@ -7366,6 +7380,27 @@
  };
  
  static void
@@ -78,7 +75,7 @@
 +
 +	if (strcmp (gtk_action_get_name (action), NAUTILUS_ACTION_NEW_EMPTY_DOCUMENT) == 0 &&
 +	    GTK_IS_IMAGE_MENU_ITEM (proxy)) {
-+		pixbuf = nautilus_ui_get_menu_icon ("text-x-generic");
++		pixbuf = nautilus_ui_get_menu_icon ("text-x-generic", GTK_WIDGET (view));
 +		if (pixbuf != NULL) {
 +			image = gtk_image_new_from_pixbuf (pixbuf);
 +			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
@@ -92,7 +89,7 @@
  pre_activate (NautilusView *view,
  	      GtkAction *action,
  	      GtkActionGroup *action_group)
-@@ -7433,6 +7468,9 @@
+@@ -7428,6 +7463,9 @@
  	g_object_unref (action);
  	g_free (tooltip);
  
@@ -102,7 +99,7 @@
  	g_signal_connect_object (action_group, "pre-activate",
  				 G_CALLBACK (pre_activate), G_OBJECT (view),
  				 G_CONNECT_SWAPPED);
-@@ -8752,7 +8790,11 @@
+@@ -8797,7 +8797,11 @@
  	action = gtk_action_group_get_action (view->details->dir_action_group,
  					      NAUTILUS_ACTION_NEW_DOCUMENTS);
  	gtk_action_set_sensitive (action, can_create_files);

=== removed file 'debian/patches/disconnect-extra-location-widgets.patch'
--- debian/patches/disconnect-extra-location-widgets.patch	2014-01-15 01:39:50 +0000
+++ debian/patches/disconnect-extra-location-widgets.patch	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-From ac1afaf6040decd43954ad9164fb61c8dba25b33 Mon Sep 17 00:00:00 2001
-From: Iain Lane <[e-mail]>
-Date: Thu, 20 Jun 2013 11:32:16 +0100
-Subject: [PATCH] Remove extra location widgets when disposing
- NautilusWindowSlot
-
-This causes the widgets to be properly destroyed before the NautilusView
-is.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=702546
----
- src/nautilus-window-slot.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: nautilus-3.8.2/src/nautilus-window-slot.c
-===================================================================
---- nautilus-3.8.2.orig/src/nautilus-window-slot.c	2014-01-15 14:31:52.489605456 +1300
-+++ nautilus-3.8.2/src/nautilus-window-slot.c	2014-01-15 14:31:52.485605456 +1300
-@@ -2418,6 +2418,8 @@
- 	nautilus_window_slot_clear_forward_list (slot);
- 	nautilus_window_slot_clear_back_list (slot);
- 
-+	nautilus_window_slot_remove_extra_location_widgets (slot);
-+
- 	if (slot->details->content_view) {
- 		nautilus_window_disconnect_content_view (nautilus_window_slot_get_window (slot),
- 							 slot->details->content_view);

=== removed file 'debian/patches/git_correct_context_menu.patch'
--- debian/patches/git_correct_context_menu.patch	2013-12-02 10:33:05 +0000
+++ debian/patches/git_correct_context_menu.patch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-From 70cba46d78fc75577cef291979c323ed7d30af20 Mon Sep 17 00:00:00 2001
-From: Srinivasa Ragavan <[e-mail]>
-Date: Wed, 17 Jul 2013 13:45:39 +0000
-Subject: Store the correct current_item if it has changed. It is incorrect to
-
-ignore the new current item just because the mouse is down. It is
-later used for right click.
-
-Fixes bgo #704289.
----
-diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
-index 7ebd6cc..c929727 100644
---- a/eel/eel-canvas.c
-+++ b/eel/eel-canvas.c
-@@ -2593,6 +2593,7 @@ pick_current_item (EelCanvas *canvas, GdkEvent *event)
- 	/* new_current_item may have been set to NULL during the call to emit_event() above */
- 
- 	if ((canvas->new_current_item != canvas->current_item) && button_down) {
-+		canvas->current_item = canvas->new_current_item;	
- 		canvas->left_grabbed_item = TRUE;
- 		return retval;
- 	}
---
-cgit v0.9.2
-

=== added file 'debian/patches/git_invalid_symlink_handling.patch'
--- debian/patches/git_invalid_symlink_handling.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_invalid_symlink_handling.patch	2014-01-25 02:17:44 +0000
@@ -0,0 +1,24 @@
+From c2a5e05231ea0743ef89e666c37a0a77534b9573 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <[e-mail]>
+Date: Thu, 07 Nov 2013 03:53:45 +0000
+Subject: NautilusFile: fix crash in modify_link_hash_table
+
+We crash in g_hash_table_lookup_extended if the file's symlink_name is
+set but the file is not a symlink, since the hash function (g_str_hash)
+does not allow NULL values but target_uri is NULL.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711583
+---
+Index: nautilus-3.8.2/libnautilus-private/nautilus-file.c
+===================================================================
+--- nautilus-3.8.2.orig/libnautilus-private/nautilus-file.c	2014-01-15 14:32:11.321604804 +1300
++++ nautilus-3.8.2/libnautilus-private/nautilus-file.c	2014-01-15 14:32:11.317604804 +1300
+@@ -556,7 +556,7 @@
+ 	GList **list_ptr;
+ 
+ 	/* Check if there is a symlink name. If none, we are OK. */
+-	if (file->details->symlink_name == NULL) {
++	if (file->details->symlink_name == NULL || !nautilus_file_is_symbolic_link (file)) {
+ 		return;
+ 	}
+ 

=== removed file 'debian/patches/git_invalid_symlink_handling.patch'
--- debian/patches/git_invalid_symlink_handling.patch	2014-01-15 01:39:50 +0000
+++ debian/patches/git_invalid_symlink_handling.patch	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-From c2a5e05231ea0743ef89e666c37a0a77534b9573 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <[e-mail]>
-Date: Thu, 07 Nov 2013 03:53:45 +0000
-Subject: NautilusFile: fix crash in modify_link_hash_table
-
-We crash in g_hash_table_lookup_extended if the file's symlink_name is
-set but the file is not a symlink, since the hash function (g_str_hash)
-does not allow NULL values but target_uri is NULL.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711583
----
-Index: nautilus-3.8.2/libnautilus-private/nautilus-file.c
-===================================================================
---- nautilus-3.8.2.orig/libnautilus-private/nautilus-file.c	2014-01-15 14:32:11.321604804 +1300
-+++ nautilus-3.8.2/libnautilus-private/nautilus-file.c	2014-01-15 14:32:11.317604804 +1300
-@@ -556,7 +556,7 @@
- 	GList **list_ptr;
- 
- 	/* Check if there is a symlink name. If none, we are OK. */
--	if (file->details->symlink_name == NULL) {
-+	if (file->details->symlink_name == NULL || !nautilus_file_is_symbolic_link (file)) {
- 		return;
- 	}
- 

=== removed file 'debian/patches/git_list_handlers.patch'
--- debian/patches/git_list_handlers.patch	2013-10-11 13:20:38 +0000
+++ debian/patches/git_list_handlers.patch	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-From 9a4ff3ca0d8476e15daa6dd92ac6c0eb8c5b9695 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <[e-mail]>
-Date: Tue, 17 Sep 2013 17:59:37 +0000
-Subject: Revert "mime-actions: filter applications not supposed to be visible"
-
-This reverts commit 7770b63d6726bc7ab4b886d6bd3edd009e622e55.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=702681
----
-diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
-index ae9fa8a..401aa8c 100644
---- a/src/nautilus-mime-actions.c
-+++ b/src/nautilus-mime-actions.c
-@@ -258,28 +258,6 @@ filter_nautilus_handler (GList *apps)
- }
- 
- static GList*
--filter_no_show_apps (GList *apps)
--{
--	GList *l, *next;
--	GAppInfo *application;
--
--	l = apps;
--	while (l != NULL) {
--		application = (GAppInfo *) l->data;
--		next = l->next;
--
--		if (!g_app_info_should_show (application)) {
--			g_object_unref (application);
--			apps = g_list_delete_link (apps, l);
--		}
--
--		l = next;
--	}
--
--	return apps;
--}
--
--static GList*
- filter_non_uri_apps (GList *apps,
- 		     gboolean accept_files)
- {
-@@ -470,8 +448,6 @@ nautilus_mime_get_applications_for_file (NautilusFile *file)
- 		g_free (uri_scheme);
- 	}
- 
--	result = filter_no_show_apps (result);
--
- 	/* Filter out non-uri supporting apps */
- 	result = filter_non_uri_apps (result, file_has_local_path (file));
- 
-

=== removed file 'debian/patches/git_no_bookmark_on_eject.patch'
--- debian/patches/git_no_bookmark_on_eject.patch	2013-12-02 10:29:06 +0000
+++ debian/patches/git_no_bookmark_on_eject.patch	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-From d5c09af0d7052b778e295ece5b4bdda71b779383 Mon Sep 17 00:00:00 2001
-From: Joshua Lock <[e-mail]>
-Date: Thu, 11 Jul 2013 20:43:09 +0000
-Subject: places-sidebar: don't call open_selected_bookmark () when ejecting
-
-This prevents nautilus trying to switch to the place which is being ejected
-and in turn showing an error.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=699183
----
-diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
-index 774739a..a487d90 100644
---- a/src/nautilus-places-sidebar.c
-+++ b/src/nautilus-places-sidebar.c
-@@ -2924,13 +2924,18 @@ bookmarks_row_activated_cb (GtkWidget *widget,
- 			    NautilusPlacesSidebar *sidebar)
- {
- 	GtkTreeIter iter;
-+	GtkTreePath *clicked_path = NULL;
- 	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
- 
- 	if (!gtk_tree_model_get_iter (model, &iter, path)) {
- 		return;
- 	}
- 
--	open_selected_bookmark (sidebar, model, &iter, 0);
-+	if (!clicked_eject_button (sidebar, &clicked_path)) {
-+		open_selected_bookmark (sidebar, model, &iter, 0);
-+	} else {
-+		gtk_tree_path_free (clicked_path);
-+	}
- }
- 
- static gboolean
---
-cgit v0.9.2
-

=== added file 'debian/patches/git_rename_background.patch'
--- debian/patches/git_rename_background.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_rename_background.patch	2014-01-25 02:17:44 +0000
@@ -0,0 +1,26 @@
+From c3b2b0a0223aa18cae06259304842e4af5ac1529 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <[e-mail]>
+Date: Wed, 06 Nov 2013 09:23:58 +0000
+Subject: EelEditableLabel: Render background
+
+Without this the rename widget background is always transparent, which
+makes it very hard to read on e.g. the desktop with a background
+image.
+---
+diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
+index 0da68fd..f348a90 100644
+--- a/eel/eel-editable-label.c
++++ b/eel/eel-editable-label.c
+@@ -1504,6 +1504,11 @@ eel_editable_label_draw (GtkWidget *widget,
+   label = EEL_EDITABLE_LABEL (widget);
+   style = gtk_widget_get_style_context (widget);
+ 
++  gtk_render_background (style, cr,
++                         0, 0,
++                         gtk_widget_get_allocated_width (widget),
++                         gtk_widget_get_allocated_height (widget));
++
+   eel_editable_label_ensure_layout (label, TRUE);
+   
+   if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget) &&
+

=== removed file 'debian/patches/git_rename_background.patch'
--- debian/patches/git_rename_background.patch	2013-11-18 12:52:19 +0000
+++ debian/patches/git_rename_background.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-From c3b2b0a0223aa18cae06259304842e4af5ac1529 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <[e-mail]>
-Date: Wed, 06 Nov 2013 09:23:58 +0000
-Subject: EelEditableLabel: Render background
-
-Without this the rename widget background is always transparent, which
-makes it very hard to read on e.g. the desktop with a background
-image.
----
-diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
-index 0da68fd..f348a90 100644
---- a/eel/eel-editable-label.c
-+++ b/eel/eel-editable-label.c
-@@ -1504,6 +1504,11 @@ eel_editable_label_draw (GtkWidget *widget,
-   label = EEL_EDITABLE_LABEL (widget);
-   style = gtk_widget_get_style_context (widget);
- 
-+  gtk_render_background (style, cr,
-+                         0, 0,
-+                         gtk_widget_get_allocated_width (widget),
-+                         gtk_widget_get_allocated_height (widget));
-+
-   eel_editable_label_ensure_layout (label, TRUE);
-   
-   if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget) &&
-

=== removed file 'debian/patches/git_rename_display.patch'
--- debian/patches/git_rename_display.patch	2014-01-10 16:45:46 +0000
+++ debian/patches/git_rename_display.patch	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
-index c929727..0739ceb 100644
---- a/eel/eel-canvas.c
-+++ b/eel/eel-canvas.c
-@@ -2834,11 +2834,19 @@ eel_canvas_draw (GtkWidget *widget, cairo_t *cr)
-                 return FALSE;
- 
-         bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
-+
-+	if (!gtk_cairo_should_draw_window (cr, bin_window))
-+		return FALSE;
-+
-+	cairo_save (cr);
-+
-         gtk_cairo_transform_to_window (cr, widget, bin_window);
- 
-         region = eel_cairo_get_clip_region (cr);
--        if (region == NULL)
-+        if (region == NULL) {
-+		cairo_restore (cr);
-                 return FALSE;
-+	}
- 
- #ifdef VERBOSE
- 	g_print ("Draw\n");
-@@ -2870,6 +2878,8 @@ eel_canvas_draw (GtkWidget *widget, cairo_t *cr)
- 	if (canvas->root->flags & EEL_CANVAS_ITEM_MAPPED)
- 		EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->draw (canvas->root, cr, region);
- 
-+	cairo_restore (cr);
-+
- 	/* Chain up to get exposes on child widgets */
-         if (GTK_WIDGET_CLASS (canvas_parent_class)->draw)
-                 GTK_WIDGET_CLASS (canvas_parent_class)->draw (widget, cr);
---
-cgit v0.9.2

=== removed file 'debian/patches/git_rtl_icons.patch'
--- debian/patches/git_rtl_icons.patch	2013-12-02 10:40:46 +0000
+++ debian/patches/git_rtl_icons.patch	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-From e123ad58bbb26e9369d5b7573e538c0c2455da0f Mon Sep 17 00:00:00 2001
-From: Yosef Or Boczko <[e-mail]>
-Date: Mon, 29 Jul 2013 15:44:14 +0000
-Subject: toolbar: Set button arrow icons according to locale's text direction
-
-https://bugzilla.gnome.org/show_bug.cgi?id=705072
----
-diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
-index 15575fd..9ef565b 100644
---- a/src/nautilus-toolbar.c
-+++ b/src/nautilus-toolbar.c
-@@ -408,9 +408,12 @@ nautilus_toolbar_constructed (GObject *obj)
- 	GtkToolItem *back_forward;
- 	GtkToolItem *tool_item;
- 	GtkUIManager *ui_manager;
-+	gboolean rtl;
- 
- 	G_OBJECT_CLASS (nautilus_toolbar_parent_class)->constructed (obj);
- 
-+	rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
-+
- 	ui_manager = nautilus_window_get_ui_manager (self->priv->window);
- 
- 	gtk_style_context_set_junction_sides (gtk_widget_get_style_context (GTK_WIDGET (self)),
-@@ -433,11 +436,15 @@ nautilus_toolbar_constructed (GObject *obj)
- 
- 	/* Back */
- 	tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_BACK, NULL);
-+	gtk_action_set_icon_name (gtk_activatable_get_related_action (tool_button),
-+				  rtl ? "go-previous-rtl-symbolic" : "go-previous-symbolic");
- 	navigation_button_setup_menu (self, tool_button, NAUTILUS_NAVIGATION_DIRECTION_BACK);
- 	gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
- 
- 	/* Forward */
- 	tool_button = toolbar_create_toolbutton (self, FALSE, FALSE, NAUTILUS_ACTION_FORWARD, NULL);
-+	gtk_action_set_icon_name (gtk_activatable_get_related_action (tool_button),
-+				  rtl ? "go-next-rtl-symbolic" : "go-next-symbolic");
- 	navigation_button_setup_menu (self, tool_button, NAUTILUS_NAVIGATION_DIRECTION_FORWARD);
- 	gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
- 
---
-cgit v0.9.2
-

=== removed file 'debian/patches/git_rubberbands_color.patch'
--- debian/patches/git_rubberbands_color.patch	2013-06-19 17:51:04 +0000
+++ debian/patches/git_rubberbands_color.patch	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-From d532ab4f91d374beb53bbd091cf8a3f0fb288c97 Mon Sep 17 00:00:00 2001
-From: Ted Gould <[e-mail]>
-Date: Mon, 29 Apr 2013 17:47:45 +0000
-Subject: Shade rubberbands on the desktop by the wallpaper
-
-Use the _GNOME_BACKGROUND_REPRESENTATIVE_COLORS X atom to decide how to
-shade the rubberband when selecting icons on the desktop.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=695689
----
-diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c
-index 1450565..8df1e47 100644
---- a/libnautilus-private/nautilus-canvas-container.c
-+++ b/libnautilus-private/nautilus-canvas-container.c
-@@ -26,6 +26,8 @@
- */
- 
- #include <config.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
- #include <math.h>
- #include "nautilus-canvas-container.h"
- 
-@@ -2327,6 +2329,79 @@ rubberband_timeout_callback (gpointer data)
- }
- 
- static void
-+get_rubber_color (NautilusCanvasContainer *container,
-+                  GdkRGBA *bgcolor,
-+                  GdkRGBA *bordercolor)
-+{
-+	Atom         real_type;
-+	gint         result;
-+	gint         real_format;
-+	gulong       items_read = 0;
-+	gulong       items_left = 0;
-+	gchar       *colors;
-+	Atom         representative_colors_atom;
-+	Display     *display;
-+
-+	if (nautilus_canvas_container_get_is_desktop (container)) {
-+		representative_colors_atom = gdk_x11_get_xatom_by_name ("_GNOME_BACKGROUND_REPRESENTATIVE_COLORS");
-+		display = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
-+
-+		gdk_error_trap_push ();
-+		result = XGetWindowProperty (display,
-+		                             GDK_ROOT_WINDOW (),
-+		                             representative_colors_atom,
-+		                             0L,
-+		                             G_MAXLONG,
-+		                             False,
-+		                             XA_STRING,
-+		                             &real_type,
-+		                             &real_format,
-+		                             &items_read,
-+		                             &items_left,
-+		                             (guchar **) &colors);
-+		gdk_error_trap_pop_ignored ();
-+	}
-+
-+	if (result == Success && items_read) {
-+		/* by treating the result as a nul-terminated string, we
-+		 * select the first colour in the list.
-+		 */
-+		GdkRGBA read;
-+		gdouble shade;
-+
-+		gdk_rgba_parse (&read, colors);
-+		XFree (colors);
-+
-+		/* Border
-+		 *
-+		 * We shade darker colours to be slightly lighter and
-+		 * lighter ones to be slightly darker.
-+		 */
-+		shade = read.green < 0.5 ? 1.1 : 0.9;
-+		bordercolor->red = read.red * shade;
-+		bordercolor->green = read.green * shade;
-+		bordercolor->blue = read.blue * shade;
-+		bordercolor->alpha = 1.0;
-+
-+		/* Background */
-+		*bgcolor = read;
-+		bgcolor->alpha = 0.6;
-+	} else {
-+		/* Fallback to the style context if we can't get the Atom */
-+		GtkStyleContext *context;
-+
-+		context = gtk_widget_get_style_context (GTK_WIDGET (container));
-+		gtk_style_context_save (context);
-+		gtk_style_context_add_class (context, GTK_STYLE_CLASS_RUBBERBAND);
-+
-+		gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, bgcolor);
-+		gtk_style_context_get_border_color (context, GTK_STATE_FLAG_NORMAL, bordercolor);
-+
-+		gtk_style_context_restore (context);
-+	}
-+}
-+
-+static void
- start_rubberbanding (NautilusCanvasContainer *container,
- 		     GdkEventButton *event)
- {
-@@ -2336,7 +2411,6 @@ start_rubberbanding (NautilusCanvasContainer *container,
- 	GdkRGBA bg_color, border_color;
- 	GList *p;
- 	NautilusCanvasIcon *icon;
--	GtkStyleContext *context;
- 
- 	details = container->details;
- 	band_info = &details->rubberband_info;
-@@ -2353,14 +2427,7 @@ start_rubberbanding (NautilusCanvasContainer *container,
- 		(EEL_CANVAS (container), event->x, event->y,
- 		 &band_info->start_x, &band_info->start_y);
- 
--	context = gtk_widget_get_style_context (GTK_WIDGET (container));
--	gtk_style_context_save (context);
--	gtk_style_context_add_class (context, GTK_STYLE_CLASS_RUBBERBAND);
--
--	gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg_color);
--	gtk_style_context_get_border_color (context, GTK_STATE_FLAG_NORMAL, &border_color);
--
--	gtk_style_context_restore (context);
-+	get_rubber_color (container, &bg_color, &border_color);
- 
- 	band_info->selection_rectangle = eel_canvas_item_new
- 		(eel_canvas_root
---
-cgit v0.9.2

=== added file 'debian/patches/git_sidebar_state_on_start.patch'
--- debian/patches/git_sidebar_state_on_start.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_sidebar_state_on_start.patch	2014-01-25 02:17:44 +0000
@@ -0,0 +1,49 @@
+Index: nautilus-3.8.2/src/nautilus-window.c
+===================================================================
+--- nautilus-3.8.2.orig/src/nautilus-window.c	2014-01-17 13:39:15.618921261 +0100
++++ nautilus-3.8.2/src/nautilus-window.c	2014-01-17 13:40:01.138918967 +0100
+@@ -455,6 +455,8 @@
+ 	GdkScreen *screen;
+ 	guint max_width_for_screen, max_height_for_screen;
+ 	guint default_width, default_height;
++	gboolean show_sidebar;
++	GtkAction *action;
+ 
+ 	screen = gtk_window_get_screen (GTK_WINDOW (window));
+ 	
+@@ -469,6 +471,17 @@
+ 				          max_width_for_screen), 
+ 				     MIN (default_height, 
+ 				          max_height_for_screen));
++
++	show_sidebar = g_settings_get_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR);
++	action = gtk_action_group_get_action (window->details->main_action_group,
++					      NAUTILUS_ACTION_SHOW_HIDE_SIDEBAR);
++	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_sidebar);
++
++	if (show_sidebar) {
++		nautilus_window_show_sidebar (window);
++	} else {
++		nautilus_window_hide_sidebar (window);
++	}
+ }
+ 
+ static gboolean
+@@ -1173,16 +1186,11 @@
+ 	gtk_widget_show (window->details->main_view);
+ 
+ 	window->details->notebook = create_notebook (window);
+-	nautilus_window_set_initial_window_geometry (window);
+ 
+ 	slot = nautilus_window_open_slot (window, 0);
+ 	nautilus_window_set_active_slot (window, slot);
+ 
+-	if (g_settings_get_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR)) {
+-		nautilus_window_show_sidebar (window);
+-	} else {
+-		nautilus_window_hide_sidebar (window);
+-	}
++	nautilus_window_set_initial_window_geometry (window);
+ 
+ 	window->details->bookmarks_id =
+ 		g_signal_connect_swapped (nautilus_application_get_bookmarks (application), "changed",

=== removed file 'debian/patches/git_sidebar_state_on_start.patch'
--- debian/patches/git_sidebar_state_on_start.patch	2014-01-17 12:46:21 +0000
+++ debian/patches/git_sidebar_state_on_start.patch	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-Index: nautilus-3.8.2/src/nautilus-window.c
-===================================================================
---- nautilus-3.8.2.orig/src/nautilus-window.c	2014-01-17 13:39:15.618921261 +0100
-+++ nautilus-3.8.2/src/nautilus-window.c	2014-01-17 13:40:01.138918967 +0100
-@@ -455,6 +455,8 @@
- 	GdkScreen *screen;
- 	guint max_width_for_screen, max_height_for_screen;
- 	guint default_width, default_height;
-+	gboolean show_sidebar;
-+	GtkAction *action;
- 
- 	screen = gtk_window_get_screen (GTK_WINDOW (window));
- 	
-@@ -469,6 +471,17 @@
- 				          max_width_for_screen), 
- 				     MIN (default_height, 
- 				          max_height_for_screen));
-+
-+	show_sidebar = g_settings_get_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR);
-+	action = gtk_action_group_get_action (window->details->main_action_group,
-+					      NAUTILUS_ACTION_SHOW_HIDE_SIDEBAR);
-+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_sidebar);
-+
-+	if (show_sidebar) {
-+		nautilus_window_show_sidebar (window);
-+	} else {
-+		nautilus_window_hide_sidebar (window);
-+	}
- }
- 
- static gboolean
-@@ -1173,16 +1186,11 @@
- 	gtk_widget_show (window->details->main_view);
- 
- 	window->details->notebook = create_notebook (window);
--	nautilus_window_set_initial_window_geometry (window);
- 
- 	slot = nautilus_window_open_slot (window, 0);
- 	nautilus_window_set_active_slot (window, slot);
- 
--	if (g_settings_get_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR)) {
--		nautilus_window_show_sidebar (window);
--	} else {
--		nautilus_window_hide_sidebar (window);
--	}
-+	nautilus_window_set_initial_window_geometry (window);
- 
- 	window->details->bookmarks_id =
- 		g_signal_connect_swapped (nautilus_application_get_bookmarks (application), "changed",

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-01-22 01:25:45 +0000
+++ debian/patches/series	2014-01-25 02:17:44 +0000
@@ -14,17 +14,12 @@
 dont_wrap_labels_after_dots.patch
 19_unity_open_location_xid.patch
 20_unity_control_center.patch
-disconnect-extra-location-widgets.patch
-git_rubberbands_color.patch
 ubuntu_revert_no_wallpaper.patch
 ubuntu_sync_background_to_accountsservice.patch
-git_list_handlers.patch
 git_rename_background.patch
-git_no_bookmark_on_eject.patch
 git_invalid_symlink_handling.patch
-git_correct_context_menu.patch
-git_rtl_icons.patch
-git_rename_display.patch
 no_search_on_desktop.patch
 git_sidebar_state_on_start.patch
 interactive_search.patch
+ubuntu_show_titlebar.patch
+ubuntu_titlebar_css.patch

=== added file 'debian/patches/ubuntu_show_titlebar.patch'
--- debian/patches/ubuntu_show_titlebar.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_show_titlebar.patch	2014-01-25 02:17:44 +0000
@@ -0,0 +1,78 @@
+From: Tim Lunn <[e-mail]>
+Date: Fri, 24 Jan 2014 08:24:31 +1100
+Subject: [PATCH] Show Titlebars when running non-GNOME Session
+Description: This patch re-enables traditional titlebars and removes the CSD close
+button for all non-GNOME Sessions.
+
+--- a/src/nautilus-toolbar.c
++++ b/src/nautilus-toolbar.c
+@@ -513,30 +513,31 @@
+ 	}
+ 
+ 	/* Separator and Close */
+-	separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
+-	gtk_container_add (GTK_CONTAINER (toolbar), separator);
++        if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME")) {
++		separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
++		gtk_container_add (GTK_CONTAINER (toolbar), separator);
+ 
+-	if (rtl) {
+-		gtk_widget_set_margin_right (separator, 6);
+-	} else {
+-		gtk_widget_set_margin_left (separator, 6);
+-	}
++		if (rtl) {
++			gtk_widget_set_margin_right (separator, 6);
++		} else {
++			gtk_widget_set_margin_left (separator, 6);
++		}
+ 
+-	button = gtk_button_new_from_icon_name ("window-close-symbolic",
+-						GTK_ICON_SIZE_MENU);
+-	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+-	gtk_style_context_add_class (gtk_widget_get_style_context (button),
+-				     "titlebutton");
+-	g_signal_connect (button, "clicked",
+-			  G_CALLBACK (close_button_clicked), self);
+-	gtk_container_add (GTK_CONTAINER (toolbar), button);
++		button = gtk_button_new_from_icon_name ("window-close-symbolic",
++							GTK_ICON_SIZE_MENU);
++		gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
++		gtk_style_context_add_class (gtk_widget_get_style_context (button),
++					     "titlebutton");
++		g_signal_connect (button, "clicked",
++				  G_CALLBACK (close_button_clicked), self);
++		gtk_container_add (GTK_CONTAINER (toolbar), button);
+ 
+-	if (rtl) {
+-		gtk_widget_set_margin_right (button, 6);
+-	} else {
+-		gtk_widget_set_margin_left (button, 6);
++		if (rtl) {
++			gtk_widget_set_margin_right (button, 6);
++		} else {
++			gtk_widget_set_margin_left (button, 6);
++		}
+ 	}
+-
+ 	g_signal_connect_swapped (nautilus_preferences,
+ 				  "changed::" NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY,
+ 				  G_CALLBACK (toolbar_update_appearance), self);
+--- a/src/nautilus-window.c
++++ b/src/nautilus-window.c
+@@ -1499,7 +1499,14 @@
+ 			 G_CALLBACK (nautilus_window_load_extension_menus), window, G_CONNECT_SWAPPED);
+ 
+ 	window->details->toolbar = create_toolbar (window);
+-	gtk_window_set_titlebar (GTK_WINDOW (window), window->details->toolbar);
++	if (g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "GNOME")) {
++		gtk_container_add (GTK_CONTAINER (grid), window->details->toolbar);
++		gtk_widget_set_hexpand (window->details->toolbar, TRUE);
++		gtk_widget_set_vexpand (window->details->toolbar, FALSE);
++		gtk_widget_show (window->details->toolbar);
++	}
++	else
++		gtk_window_set_titlebar (GTK_WINDOW (window), window->details->toolbar);
+ 
+ 	window->details->content_paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+ 	gtk_widget_set_hexpand (window->details->content_paned, TRUE);

=== added file 'debian/patches/ubuntu_titlebar_css.patch'
--- debian/patches/ubuntu_titlebar_css.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_titlebar_css.patch	2014-01-25 02:17:44 +0000
@@ -0,0 +1,93 @@
+From: Tim Lunn <[e-mail]>
+Date: Fri, 24 Jan 2014 08:24:31 +1100
+Subject: [PATCH] Override some css theming for nautilus topbar
+Description: This patch overrides a few css properties for the nautilus header bar,
+done from here rather than in the themes since nautilus uses a non-standard header
+bar implementation.
+
+---
+ src/nautilus-toolbar.c | 40 +++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 39 insertions(+), 1 deletion(-)
+
+--- a/src/nautilus-toolbar.c
++++ b/src/nautilus-toolbar.c
+@@ -81,6 +81,43 @@
+ 				!show_location_entry);
+ }
+ 
++static void
++toolbar_override_css (GtkWidget *widget,
++		      const gchar *name,
++		      const gchar *css_string)
++{
++	GtkCssProvider *css;
++	GtkSettings* settings;
++	GError *error = NULL;
++	gchar *theme_name;
++
++	settings = gtk_settings_get_default();
++	g_object_get(settings, "gtk-theme-name", &theme_name, NULL);
++
++	if (g_strcmp0(theme_name, "Ambiance") == 0 || g_strcmp0(theme_name, "Radiance") == 0)
++	  {
++		gtk_widget_set_name (widget, name);
++		css = gtk_css_provider_new ();
++		if (gtk_css_provider_load_from_data (css,
++						     css_string,
++					             -1, &error))
++	          {
++	                GtkStyleContext *context = gtk_widget_get_style_context (widget);
++	                gtk_style_context_add_provider (context, (GtkStyleProvider *) css,
++	                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++		  }
++		else
++		  {
++			g_warning ("Error processing CSS theme override: %s", error->message);
++			g_clear_error (&error);
++		  }
++		g_object_unref (css);
++	  }
++	g_free (theme_name);
++}
++
++
++
+ static GtkWidget *
+ toolbar_create_toolbutton (NautilusToolbar *self,
+ 			   gboolean create_menu,
+@@ -91,6 +128,7 @@
+ 	GtkWidget *button, *image;
+ 	GtkActionGroup *action_group;
+ 	GtkAction *action;
++	const gchar *css_string;
+ 
+ 	action_group = nautilus_window_get_main_action_group (self->priv->window);
+ 
+@@ -117,6 +155,9 @@
+ 		gtk_widget_set_tooltip_text (button, gtk_action_get_tooltip (action));
+ 	}
+ 
++	css_string = "GtkButton#toolbar-button {padding: 9px;}";
++	toolbar_override_css (button, "toolbar-button", css_string);
++
+ 	return button;
+ }
+ 
+@@ -399,6 +440,7 @@
+ 	GtkWidget *separator;
+ 	GtkUIManager *ui_manager;
+ 	gboolean rtl;
++	const gchar *css_string;
+ 
+ 	G_OBJECT_CLASS (nautilus_toolbar_parent_class)->constructed (obj);
+ 
+@@ -408,6 +450,9 @@
+ 	self->priv->toolbar = toolbar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ 	gtk_container_add (GTK_CONTAINER (self), toolbar);
+ 
++	css_string = ".header-bar { border-radius: 0; padding: 1px;}";
++	toolbar_override_css (GTK_WIDGET (self), "toolbar", css_string);
++
+ 	rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
+ 
+ 	ui_manager = nautilus_window_get_ui_manager (self->priv->window);