r15587 - in /desktop/experimental/nautilus/debian: changelog patches/05_places-sidebar_single-click.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Tue Apr  8 18:15:45 2008
New Revision: 15587

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15587
Log:
New upstream bugfix release:
+ debian/patches/05_places-sidebar_single-click.patch:
- Updated to apply cleanly again.

Modified:
    desktop/experimental/nautilus/debian/changelog
    desktop/experimental/nautilus/debian/patches/05_places-sidebar_single-click.patch

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=15587&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Tue Apr  8 18:15:45 2008
@@ -1,6 +1,8 @@
 nautilus (2.22.2-1) experimental; urgency=high
 
-  * New upstream bugfix release.
+  * New upstream bugfix release:
+    + debian/patches/05_places-sidebar_single-click.patch:
+      - Updated to apply cleanly again.
 
  -- Sebastian Dröge <slomo at debian.org>  Tue, 08 Apr 2008 18:48:04 +0200
 

Modified: desktop/experimental/nautilus/debian/patches/05_places-sidebar_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/05_places-sidebar_single-click.patch?rev=15587&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/05_places-sidebar_single-click.patch (original)
+++ desktop/experimental/nautilus/debian/patches/05_places-sidebar_single-click.patch Tue Apr  8 18:15:45 2008
@@ -4,7 +4,7 @@
 ===================================================================
 --- nautilus/src/nautilus-places-sidebar.c	(revision 13957)
 +++ nautilus/src/nautilus-places-sidebar.c	(working copy)
-@@ -580,27 +580,6 @@ row_activated_callback (GtkTreeView *tre
+@@ -580,27 +580,6 @@
  }
  
  static void
@@ -32,36 +32,17 @@
  desktop_location_changed_callback (gpointer user_data)
  {
  	NautilusPlacesSidebar *sidebar;
-@@ -1796,7 +1775,6 @@ bookmarks_button_press_event_cb (GtkWidg
- 	return FALSE;
- }
- 
--
- static void
- bookmarks_edited (GtkCellRenderer       *cell,
- 		  gchar                 *path_string,
-@@ -1952,10 +1930,8 @@ nautilus_places_sidebar_init (NautilusPl
+@@ -1950,11 +1929,8 @@
  	g_signal_connect (tree_view, "button-press-event",
  			  G_CALLBACK (bookmarks_button_press_event_cb), sidebar);
  
--	eel_preferences_add_callback (NAUTILUS_PREFERENCES_CLICK_POLICY,
--				      click_policy_changed_callback,
--				      sidebar);
+-	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_CLICK_POLICY,
+-						  click_policy_changed_callback,
+-						  sidebar,
+-						  G_OBJECT (sidebar));
 -	update_click_policy (sidebar);
 +	eel_gtk_tree_view_set_activate_on_single_click (sidebar->tree_view,
 +							TRUE);
  
  	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR,
  						  desktop_location_changed_callback,
-@@ -1986,10 +1962,6 @@ nautilus_places_sidebar_finalize (GObjec
- 	}
- 
- 	g_object_unref (sidebar->volume_monitor);
--	
--	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_CLICK_POLICY,
--					 click_policy_changed_callback,
--					 sidebar);
- 
- 	G_OBJECT_CLASS (nautilus_places_sidebar_parent_class)->finalize (object);
- }
-