r11002 - in /desktop/unstable/nautilus/debian: changelog patches/12_list-view_expand.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue May 15 22:58:15 2007
New Revision: 11002

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11002
Log:
* 12_list-view_expand.patch: set a minimum width for the name column 
  to avoid opening a window with a too small name column. Partially 
  fixes #422563.

Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=11002&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Tue May 15 22:58:15 2007
@@ -1,11 +1,17 @@
-nautilus (2.18.1-3) UNRELEASED; urgency=low
-
+nautilus (2.18.1-3) unstable; urgency=low
+
+  [ Loic Minier ]
   * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
     cdbs >= 0.4.41.
   * Prepend -z defs to LDFLAGS for additional safety.
   * Wrap build-deps and deps.
 
- -- Loic Minier <lool at dooz.org>  Sun, 06 May 2007 10:43:36 +0200
+  [ Josselin Mouette ]
+  * 12_list-view_expand.patch: set a minimum width for the name column 
+    to avoid opening a window with a too small name column. Partially 
+    fixes #422563.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 16 May 2007 00:21:01 +0200
 
 nautilus (2.18.1-2) unstable; urgency=low
 

Modified: desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch?rev=11002&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch (original)
+++ desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch Tue May 15 22:58:15 2007
@@ -1,16 +1,27 @@
 Index: nautilus-2.18.1/src/file-manager/fm-list-view.c
 ===================================================================
---- nautilus-2.18.1.orig/src/file-manager/fm-list-view.c	2007-05-01 16:14:42.669367500 +0200
-+++ nautilus-2.18.1/src/file-manager/fm-list-view.c	2007-05-01 16:16:01.902319250 +0200
-@@ -1360,6 +1360,7 @@
+--- nautilus-2.18.1.orig/src/file-manager/fm-list-view.c	2007-04-10 14:05:29.000000000 +0200
++++ nautilus-2.18.1/src/file-manager/fm-list-view.c	2007-05-16 00:46:09.805874250 +0200
+@@ -1337,7 +1337,7 @@
+ 
+ 	for (l = nautilus_columns; l != NULL; l = l->next) {
+ 		NautilusColumn *nautilus_column;
+-		int column_num;		
++		int column_num, font_size;
+ 		char *name;
+ 		char *label;
+ 		float xalign;
+@@ -1360,6 +1360,9 @@
  			view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
  			
  			view->details->file_name_column = gtk_tree_view_column_new ();
 +			gtk_tree_view_column_set_expand (view->details->file_name_column, TRUE);
++			font_size = PANGO_PIXELS (pango_font_description_get_size (GTK_WIDGET(view)->style->font_desc));
++			gtk_tree_view_column_set_min_width (view->details->file_name_column, 16*font_size);
  			g_object_ref (view->details->file_name_column);
  			gtk_object_sink (GTK_OBJECT (view->details->file_name_column));
  			view->details->file_name_column_num = column_num;
-@@ -1384,7 +1385,7 @@
+@@ -1384,7 +1387,7 @@
  			cell = gtk_cell_renderer_text_new ();
                          g_object_set (cell,
                                        "ellipsize", PANGO_ELLIPSIZE_END,