Merge lp:~larsu/nautilus/remove-titlebar-css-patch into lp:~ubuntu-desktop/nautilus/ubuntu

[Lars Karlitski]

Remove ubuntu_titlebar_css.patch

The relevant rules have been added to the themes.

Remove ubuntu_titlebar_css.patch

The relevant rules have been added to the themes.

Soft-depends on lp:~larsu/ubuntu-themes/three-twelve (it will work without, but nautilus' toolbar is styled wrong).

[Sebastien Bacher (seb128)]

Thanks! The themes changes are in a landing, let's wait for that to be in the archive before uploading nautilus

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-13 11:48:27 +0000
+++ debian/changelog	2014-07-10 15:12:03 +0000
@@ -1,3 +1,10 @@
+nautilus (1:3.10.1-0ubuntu12) UNRELEASED; urgency=medium
+
+  * debian/patches/ubuntu_titlebar_css.patch:
+    - Remove; the css fixes have been added to the theme
+
+ -- Lars Uebernickel <[e-mail]>  Thu, 10 Jul 2014 17:08:31 +0200
+
 nautilus (1:3.10.1-0ubuntu11) utopic; urgency=medium
 
   * debian/patches/git_revert_symlink_logic_change.patch:
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-05-13 11:48:11 +0000
+++ debian/patches/series	2014-07-10 15:12:03 +0000
@@ -23,7 +23,6 @@
 ubuntu_show_titlebar.patch
 restore-traditional-menu-bar.patch
 16_unity_new_documents.patch
-ubuntu_titlebar_css.patch
 ubuntu_backspace_behaviour.patch
 git_valid_location_widget.patch
 ubuntu_infobars_color.patch
 
=== removed file 'debian/patches/ubuntu_titlebar_css.patch'
--- debian/patches/ubuntu_titlebar_css.patch	2014-01-25 01:49:27 +0000
+++ debian/patches/ubuntu_titlebar_css.patch	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-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);