r16187 - in /desktop/unstable/nautilus/debian: changelog patches/05_places-sidebar_single-click.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun  7 11:06:17 2008
New Revision: 16187

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16187
Log:
05_places-sidebar_single-click.patch: replaced by upstream version 
of the patch, that does not activate items while right-clicking 
them. Closes: #414960.

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

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=16187&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Sat Jun  7 11:06:17 2008
@@ -1,3 +1,11 @@
+nautilus (2.20.0-5) UNRELEASED; urgency=low
+
+  * 05_places-sidebar_single-click.patch: replaced by upstream version 
+    of the patch, that does not activate items while right-clicking 
+    them. Closes: #414960.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 07 Jun 2008 13:05:26 +0200
+
 nautilus (2.20.0-4) unstable; urgency=low
 
   [ Loic Minier ]

Modified: desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch?rev=16187&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch (original)
+++ desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch Sat Jun  7 11:06:17 2008
@@ -1,31 +1,48 @@
 GNOME #355760
+Based on upstream commit r14102.
+
 Index: nautilus-2.20.0/src/nautilus-places-sidebar.c
 ===================================================================
---- nautilus-2.20.0.orig/src/nautilus-places-sidebar.c	2007-09-24 11:59:51.082093228 +0200
-+++ nautilus-2.20.0/src/nautilus-places-sidebar.c	2007-09-24 12:09:36.843473867 +0200
-@@ -472,11 +472,11 @@
+--- nautilus-2.20.0.orig/src/nautilus-places-sidebar.c	2007-08-21 11:37:49.000000000 +0200
++++ nautilus-2.20.0/src/nautilus-places-sidebar.c	2008-06-07 13:03:45.007015138 +0200
+@@ -484,27 +484,6 @@ row_activated_callback (GtkTreeView *tre
  }
  
  static void
--row_activated_callback (GtkTreeView *tree_view,
--			GtkTreePath *path,
--			GtkTreeViewColumn *column,
-+cursor_changed_callback (GtkTreeView *tree_view,
- 			gpointer user_data)
+-update_click_policy (NautilusPlacesSidebar *sidebar)
+-{
+-	int policy;
+-	
+-	policy = eel_preferences_get_enum (NAUTILUS_PREFERENCES_CLICK_POLICY);
+-	
+-	eel_gtk_tree_view_set_activate_on_single_click
+-		(sidebar->tree_view, policy == NAUTILUS_CLICK_POLICY_SINGLE);
+-}
+-
+-static void
+-click_policy_changed_callback (gpointer user_data)
+-{
+-	NautilusPlacesSidebar *sidebar;
+-	
+-	sidebar = NAUTILUS_PLACES_SIDEBAR (user_data);
+-
+-	update_click_policy (sidebar);
+-}
+-
+-static void
+ desktop_location_changed_callback (gpointer user_data)
  {
-+	GtkTreePath *path;
-+	gtk_tree_view_get_cursor (tree_view, &path, NULL);
- 	open_selected_bookmark (NAUTILUS_PLACES_SIDEBAR (user_data),
- 				gtk_tree_view_get_model (tree_view),
- 				path,
-@@ -1679,8 +1679,8 @@
- 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+ 	NautilusPlacesSidebar *sidebar;
+@@ -1713,10 +1692,8 @@ nautilus_places_sidebar_init (NautilusPl
+ 	g_signal_connect (tree_view, "button-press-event",
+ 			  G_CALLBACK (bookmarks_button_press_event_cb), sidebar);
  
- 	g_signal_connect_object
--		(tree_view, "row_activated", 
--		 G_CALLBACK (row_activated_callback), sidebar, 0);
-+		(tree_view, "cursor_changed", 
-+		 G_CALLBACK (cursor_changed_callback), sidebar, 0);
+-	eel_preferences_add_callback (NAUTILUS_PREFERENCES_CLICK_POLICY,
+-				      click_policy_changed_callback,
+-				      sidebar);
+-	update_click_policy (sidebar);
++	eel_gtk_tree_view_set_activate_on_single_click (sidebar->tree_view,
++							TRUE);
  
- 
- 	gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tree_view),
+ 	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR,
+ 						  desktop_location_changed_callback,