r28137 - in /desktop/experimental/nautilus/debian: changelog patches/12_list-view_expand.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue May 31 21:01:58 2011
New Revision: 28137

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28137
Log:
    refreshed. Update to GTK+ 3.

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

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=28137&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Tue May 31 21:01:58 2011
@@ -1,4 +1,4 @@
-nautilus (3.0.2-1) UNRELEASED; urgency=low
+nautilus (3.0.2-1) experimental; urgency=low
 
   * Rebuild against a cdbs+debhelper with dh_installgsettings.
     Closes: #627477.
@@ -17,11 +17,11 @@
   * Reintroduce some nautilus 2.x patches.
     + 03_deprecated.patch: still necessary, refreshed.
     + 12_list-view_expand.patch: still necessary, file was renamed, 
-      refreshed.
+      refreshed. Update to GTK+ 3.
   * nautilus.install: install the autostart file. This should bring back 
     the desktop icons functionality completely.
 
- -- Josselin Mouette <joss at debian.org>  Fri, 20 May 2011 16:21:46 +0200
+ -- Josselin Mouette <joss at debian.org>  Tue, 31 May 2011 19:30:35 +0200
 
 nautilus (3.0.0-1) experimental; urgency=low
 

Modified: desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch?rev=28137&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch [utf-8] Tue May 31 21:01:58 2011
@@ -3,7 +3,7 @@
 Index: nautilus-3.0.2/src/nautilus-list-view.c
 ===================================================================
 --- nautilus-3.0.2.orig/src/nautilus-list-view.c	2011-05-24 20:46:25.000000000 +0200
-+++ nautilus-3.0.2/src/nautilus-list-view.c	2011-05-29 11:45:29.713475420 +0200
++++ nautilus-3.0.2/src/nautilus-list-view.c	2011-05-31 19:53:21.745355384 +0200
 @@ -59,7 +59,6 @@
  #include <libnautilus-private/nautilus-module.h>
  #include <libnautilus-private/nautilus-tree-view-drag-dest.h>
@@ -26,7 +26,7 @@
  			
  			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));
++			font_size = PANGO_PIXELS (pango_font_description_get_size (gtk_style_context_get_font(gtk_widget_get_style_context(GTK_WIDGET(view)), GTK_STATE_FLAG_NORMAL)));
 +			gtk_tree_view_column_set_min_width (view->details->file_name_column, 20*font_size);
  			g_object_ref_sink (view->details->file_name_column);
  			view->details->file_name_column_num = column_num;