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

[slomo at users.alioth.debian.org]

Author: slomo
Date: Wed Mar 19 21:54:05 2008
New Revision: 15333

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15333
Log:
* 05_places-sidebar_single-click.patch: Update from bugzilla and enable
  again as it should work good now and is more consistent with the
  GTK file chooser.

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

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=15333&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Wed Mar 19 21:54:05 2008
@@ -1,3 +1,11 @@
+nautilus (2.22.0-4) UNRELEASED; urgency=low
+
+  * 05_places-sidebar_single-click.patch: Update from bugzilla and enable
+    again as it should work good now and is more consistent with the
+    GTK file chooser.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 19 Mar 2008 22:53:16 +0100
+
 nautilus (2.22.0-3) experimental; urgency=low
 
   * Disable 05_places-sidebar_single-click.patch as it's buggy.

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=15333&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 Wed Mar 19 21:54:05 2008
@@ -1,31 +1,67 @@
 GNOME #355760
-Index: nautilus-2.20.0/src/nautilus-places-sidebar.c
+
+Index: nautilus/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/src/nautilus-places-sidebar.c	(revision 13957)
++++ nautilus/src/nautilus-places-sidebar.c	(working copy)
+@@ -580,27 +580,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;
+@@ -1796,7 +1775,6 @@ bookmarks_button_press_event_cb (GtkWidg
+ 	return FALSE;
+ }
  
- 	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);
+-
+ static void
+ bookmarks_edited (GtkCellRenderer       *cell,
+ 		  gchar                 *path_string,
+@@ -1952,10 +1930,8 @@ nautilus_places_sidebar_init (NautilusPl
+ 	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);
+-	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,
+@@ -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);
+ }
+

Modified: desktop/experimental/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/series?rev=15333&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/series (original)
+++ desktop/experimental/nautilus/debian/patches/series Wed Mar 19 21:54:05 2008
@@ -1,6 +1,6 @@
 03_sftp_connect.patch
 04_show_backup_files.patch
-#05_places-sidebar_single-click.patch
+05_places-sidebar_single-click.patch
 #07_desktop_file_activation.patch
 #10_location_titlebar.patch
 12_list-view_expand.patch