Merge lp:~larsu/nautilus/set-max-width-for-properties-window into lp:~ubuntu-desktop/nautilus/ubuntu

[Lars Karlitski]

* debian/patches/properties_window_set_max_width_for_value_labels.patch:
  - avoid very wide properties window (GNOME: #732117)

* debian/patches/properties_window_set_max_width_for_value_labels.patch:
  - avoid very wide properties window (GNOME: #732117)

[Lars Karlitski (larsu)]

Just pushed this to upstream master. Should I rename the patch to git_*?

[Sebastien Bacher (seb128)]

renaming to git_ would be nicer, looks good to commit otherwise

review: Approve

[lp:~larsu/nautilus/set-max-width-for-properties-window]

440. By Lars Karlitski on 2014-10-08

Rename properties_window_set_max_width_for_value_labels

It was accespted upstream.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-30 16:59:37 +0000
+++ debian/changelog	2014-10-08 07:59:36 +0000
@@ -1,3 +1,10 @@
+nautilus (1:3.10.1-0ubuntu15) UNRELEASED; urgency=medium
+
+  * debian/patches/properties_window_set_max_width_for_value_labels.patch:
+    - avoid very wide properties window (GNOME: #732117)
+
+ -- Lars Uebernickel <[e-mail]>  Mon, 06 Oct 2014 17:23:30 +0200
+
 nautilus (1:3.10.1-0ubuntu14) utopic; urgency=medium
 
   * No-change rebuild for gnome-desktop 3.12
 
=== added file 'debian/patches/git_properties_window_set_max_width_for_value_labels.patch'
--- debian/patches/git_properties_window_set_max_width_for_value_labels.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_properties_window_set_max_width_for_value_labels.patch	2014-10-08 07:59:36 +0000
@@ -0,0 +1,27 @@
+From 0618af5a154cff26c7a04b303abcbeec2a8ca10d Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <[e-mail]>
+Date: Mon, 6 Oct 2014 13:07:51 +0200
+Subject: [PATCH] properties-window: set max-width for value labels
+
+Not setting it can lead to very wide windows, because gtk doesn't
+enforce a maximum window size anymore.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=732117
+---
+ src/nautilus-properties-window.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
+index 3b15dd9..631c456 100644
+--- a/src/nautilus-properties-window.c
++++ b/src/nautilus-properties-window.c
+@@ -1276,6 +1276,7 @@ attach_label (GtkGrid *grid,
+ 
+ 	if (ellipsize_text) {
+ 		gtk_widget_set_hexpand (label_field, TRUE);
++		gtk_label_set_max_width_chars (GTK_LABEL (label_field), 24);
+ 	}
+ 
+ 	if (sibling != NULL) {
+-- 
+2.1.0
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-09-29 16:57:17 +0000
+++ debian/patches/series	2014-10-08 07:59:36 +0000
@@ -42,3 +42,4 @@
 0001-Don-t-try-to-open-a-selection-if-we-don-t-have-one.patch
 git_also_tracker-1.0.patch
 ubuntu_tracker_only_on_GNOME.patch
+git_properties_window_set_max_width_for_value_labels.patch