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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed May 16 13:53:58 2012
New Revision: 34977

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34977
Log:
Refresh debian/patches/12_list-view_expand.patch.

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=34977&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Wed May 16 13:53:58 2012
@@ -1,6 +1,7 @@
 nautilus (3.4.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh debian/patches/12_list-view_expand.patch.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 15 May 2012 19:09:07 +0200
 

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=34977&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch [utf-8] Wed May 16 13:53:58 2012
@@ -1,10 +1,10 @@
 Revert upstream commits r12779 and r13045.
 We can do this because we fix GNOME #316087 in our GTK+ packages.
-Index: nautilus-3.2.1/src/nautilus-list-view.c
+Index: nautilus-3.4.2/src/nautilus-list-view.c
 ===================================================================
---- nautilus-3.2.1.orig/src/nautilus-list-view.c	2011-10-17 22:29:15.000000000 +0200
-+++ nautilus-3.2.1/src/nautilus-list-view.c	2011-11-21 20:52:02.675413957 +0100
-@@ -58,7 +58,6 @@
+--- nautilus-3.4.2.orig/src/nautilus-list-view.c	2012-05-14 21:37:55.000000000 +0200
++++ nautilus-3.4.2/src/nautilus-list-view.c	2012-05-15 19:10:34.044983713 +0200
+@@ -57,7 +57,6 @@
  #include <libnautilus-private/nautilus-module.h>
  #include <libnautilus-private/nautilus-tree-view-drag-dest.h>
  #include <libnautilus-private/nautilus-clipboard.h>
@@ -12,7 +12,7 @@
  
  #define DEBUG_FLAG NAUTILUS_DEBUG_LIST_VIEW
  #include <libnautilus-private/nautilus-debug.h>
-@@ -1661,7 +1660,7 @@
+@@ -1629,7 +1628,7 @@
  
  	for (l = nautilus_columns; l != NULL; l = l->next) {
  		NautilusColumn *nautilus_column;
@@ -21,7 +21,7 @@
  		char *name;
  		char *label;
  		float xalign;
-@@ -1684,6 +1683,9 @@
+@@ -1652,6 +1651,9 @@
  			view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
  			
  			view->details->file_name_column = gtk_tree_view_column_new ();
@@ -31,7 +31,7 @@
  			g_object_ref_sink (view->details->file_name_column);
  			view->details->file_name_column_num = column_num;
  			
-@@ -1703,7 +1705,11 @@
+@@ -1671,7 +1673,11 @@
  							     "pixbuf", NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN,
  							     NULL);