[Pkg-xfce-commits] r5193 - desktop/trunk/thunar/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Thu Mar 31 11:53:27 UTC 2011
Author: corsac
Date: 2011-03-31 11:53:26 +0000 (Thu, 31 Mar 2011)
New Revision: 5193
Removed:
desktop/trunk/thunar/debian/patches/01_thunar-help-directory.patch
desktop/trunk/thunar/debian/patches/03_thunar-window-maximize.patch
desktop/trunk/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch
desktop/trunk/thunar/debian/patches/06_fix-sidepane-width.patch
desktop/trunk/thunar/debian/patches/07_update-cursor-on-delete.patch
desktop/trunk/thunar/debian/patches/08_refilter-tree-hidden-dir.patch
Modified:
desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
Log:
fix patches
Deleted: desktop/trunk/thunar/debian/patches/01_thunar-help-directory.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/01_thunar-help-directory.patch 2011-03-31 11:51:57 UTC (rev 5192)
+++ desktop/trunk/thunar/debian/patches/01_thunar-help-directory.patch 2011-03-31 11:53:26 UTC (rev 5193)
@@ -1,11 +0,0 @@
---- ThunarHelp.in 2006-04-13 23:57:36.000000000 +0200
-+++ ThunarHelp.in 2006-03-01 16:44:06.000000000 +0100
-@@ -19,7 +19,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
--HELPDIR="@datadir@/doc/Thunar/html/"
-+HELPDIR="@datadir@/doc/thunar/html/"
-
- if test -n "$LC_ALL"; then
- LC=$LC_ALL
Modified: desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2011-03-31 11:51:57 UTC (rev 5192)
+++ desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2011-03-31 11:53:26 UTC (rev 5193)
@@ -8,220 +8,23 @@
thunarx/thunarx-renamer-provider.c
+.pc/02_thunar-icon-naming-spec-compliance.patch/thunar/thunar-application.c
+.pc/02_thunar-icon-naming-spec-compliance.patch/thunar/thunar-dialogs.c
-diff --git a/thunar-vfs/thunar-vfs-io-local.c b/thunar-vfs/thunar-vfs-io-local.c
-index 615a36c..e2d75e7 100644
---- a/thunar-vfs/thunar-vfs-io-local.c
-+++ b/thunar-vfs/thunar-vfs-io-local.c
-@@ -390,7 +390,7 @@ _thunar_vfs_io_local_get_info (ThunarVfsPath *path,
- if (G_UNLIKELY (filename[0] == G_DIR_SEPARATOR && filename[1] == '\0'))
- {
- /* root folder gets a special custom icon... */
-- info->custom_icon = g_strdup ("gnome-dev-harddisk");
-+ info->custom_icon = g_strdup ("drive-harddisk");
-
- /* ...and a special display name */
- info->display_name = g_strdup (_("File System"));
-diff --git a/thunar-vfs/thunar-vfs-io-trash.c b/thunar-vfs/thunar-vfs-io-trash.c
-index 8ca0370..29f333d 100644
---- a/thunar-vfs/thunar-vfs-io-trash.c
-+++ b/thunar-vfs/thunar-vfs-io-trash.c
-@@ -1119,7 +1119,7 @@ _thunar_vfs_io_trash_get_info (ThunarVfsPath *path,
- info->ctime = mtime;
- info->mime_info = thunar_vfs_mime_info_ref (_thunar_vfs_mime_inode_directory);
- info->path = thunar_vfs_path_ref (_thunar_vfs_path_trash_root);
-- info->custom_icon = g_strdup (empty ? "gnome-fs-trash-empty" : "gnome-fs-trash-full");
-+ info->custom_icon = g_strdup (empty ? "user-trash" : "user-trash-full");
- info->display_name = g_strdup (_("Trash"));
- info->ref_count = 1;
- }
-diff --git a/thunar-vfs/thunar-vfs-mime-info.c b/thunar-vfs/thunar-vfs-mime-info.c
-index 7c8fe0c..c3c07e1 100644
---- a/thunar-vfs/thunar-vfs-mime-info.c
-+++ b/thunar-vfs/thunar-vfs-mime-info.c
-@@ -47,18 +47,18 @@ static const struct
- const gchar icon[19];
- } GNOME_INODE_ICONNAMES[] =
- {
-- { "blockdevice", "gnome-fs-blockdev" },
-- { "chardevice", "gnome-fs-chardev" },
-- { "directory", "gnome-fs-directory" },
-- { "fifo", "gnome-fs-fifo" },
-- { "socket", "gnome-fs-socket" },
-+ { "blockdevice", "inode-blockdev" },
-+ { "chardevice", "inode-chardev" },
-+ { "directory", "folder" },
-+ { "fifo", "inode-fifo" },
-+ { "socket", "inode-socket" },
- };
-
- /* first fallback gnome icon name */
- static const gchar GNOME_FS_REGULAR[] = "gnome-fs-regular";
-
- /* second fallback gnome icon name */
--static const gchar GNOME_MIME_APPLICATION_OCTET_STREAM[] = "gnome-mime-application-octet-stream";
-+static const gchar GNOME_MIME_APPLICATION_OCTET_STREAM[] = "application-x-executable";
-
- /* generic standard icon names (Icon Naming Spec 0.8) */
- static const gchar XDG_GENERIC_ICONNAMES[][18] =
-diff --git a/thunar-vfs/thunar-vfs-volume.c b/thunar-vfs/thunar-vfs-volume.c
-index 95bdc99..9d5661d 100644
---- a/thunar-vfs/thunar-vfs-volume.c
-+++ b/thunar-vfs/thunar-vfs-volume.c
-@@ -398,83 +398,76 @@ thunar_vfs_volume_lookup_icon_name (ThunarVfsVolume *volume,
- kind = thunar_vfs_volume_get_kind (volume);
- switch (kind)
- {
--cdrom:
-- case THUNAR_VFS_VOLUME_KIND_CDROM:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom"))
-- return "gnome-dev-cdrom";
-- break;
--
-- case THUNAR_VFS_VOLUME_KIND_CDR:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-cdr"))
-- return "gnome-dev-disc-cdr";
-- goto cdrom;
--
-- case THUNAR_VFS_VOLUME_KIND_CDRW:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-cdrw"))
-- return "gnome-dev-disc-cdrw";
-- goto cdrom;
--
--dvdrom:
-- case THUNAR_VFS_VOLUME_KIND_DVDROM:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdrom"))
-- return "gnome-dev-disc-dvdrom";
-- else if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-dvd"))
-- return "gnome-dev-dvd";
-- goto cdrom;
--
-- case THUNAR_VFS_VOLUME_KIND_DVDRAM:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdram"))
-- return "gnome-dev-disc-dvdram";
-+ case THUNAR_VFS_VOLUME_KIND_DVDPLUSRW:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-rw-plus"))
-+ return "media-optical-dvd-rw-plus";
-+ case THUNAR_VFS_VOLUME_KIND_DVDRW:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-rw"))
-+ return "media-optical-dvd-rw";
- goto dvdrom;
--
--dvdr:
-+ case THUNAR_VFS_VOLUME_KIND_DVDPLUSR:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-r-plus"))
-+ return "media-optical-dvd-r-plus";
- case THUNAR_VFS_VOLUME_KIND_DVDR:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdr"))
-- return "gnome-dev-disc-dvdr";
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-r"))
-+ return "media-optical-dvd-r";
- goto dvdrom;
--
-- case THUNAR_VFS_VOLUME_KIND_DVDRW:
-- case THUNAR_VFS_VOLUME_KIND_DVDPLUSRW:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdrw"))
-- return "gnome-dev-disc-dvdrw";
-+ case THUNAR_VFS_VOLUME_KIND_DVDRAM:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-ram"))
-+ return "media-optical-dvd-ram";
- goto dvdrom;
--
-- case THUNAR_VFS_VOLUME_KIND_DVDPLUSR:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdr-plus"))
-- return "gnome-dev-disc-dvdr-plus";
-- goto dvdr;
-+dvdrom:
-+ case THUNAR_VFS_VOLUME_KIND_DVDROM:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd"))
-+ return "media-optical-dvd";
-+ goto optical;
-+
-+ case THUNAR_VFS_VOLUME_KIND_CDRW:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd-rw"))
-+ return "media-optical-cd-rw";
-+ goto cdrom;
-+ case THUNAR_VFS_VOLUME_KIND_CDR:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd-r"))
-+ return "media-optical-cd-r";
-+ goto cdrom;
-+cdrom:
-+ case THUNAR_VFS_VOLUME_KIND_CDROM:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd"))
-+ return "media-optical-cd";
-+ goto optical;
-+ case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-audio"))
-+ return "media-optical-audio";
-+ goto optical;
-+optical:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical"))
-+ return "media-optical";
-+ break;
-
- case THUNAR_VFS_VOLUME_KIND_FLOPPY:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-floppy"))
-- return "gnome-dev-floppy";
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-floppy"))
-+ return "media-floppy";
- break;
--
- case THUNAR_VFS_VOLUME_KIND_HARDDISK:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk"))
-- return "gnome-dev-harddisk";
-+ if (gtk_icon_theme_has_icon (icon_theme, "drive-harddisk"))
-+ return "drive-harddisk";
- break;
-
- case THUNAR_VFS_VOLUME_KIND_USBSTICK:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable-usb"))
-- return "gnome-dev-removable-usb";
-- else if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk-usb"))
-- return "gnome-dev-harddisk-usb";
-- break;
--
-+ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media-usb"))
-+ return "drive-removable-media-usb";
-+ goto removable_media;
- case THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-ipod"))
-- return "gnome-dev-ipod";
-- break;
-+ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media-ipod"))
-+ return "drive-removable-media-ipod";
-+ goto removable_media;
-
-- case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom-audio"))
-- return "gnome-dev-cdrom-audio";
-- goto cdrom;
-
- case THUNAR_VFS_VOLUME_KIND_MEMORY_CARD:
- case THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable"))
-- return "gnome-dev-removable";
-+removable_media:
-+ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media"))
-+ return "drive-removable-media";
- break;
-
- default:
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
-index c30d43a..80c9784 100644
+index dc12c08..ec1b178 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
-@@ -1166,7 +1166,7 @@ thunar_application_copy_to (ThunarApplication *application,
+@@ -1282,7 +1282,7 @@ thunar_application_copy_to (ThunarApplication *application,
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
/* launch the operation */
- thunar_application_launch (application, parent, "stock_folder-copy",
+ thunar_application_launch (application, parent, "gtk-copy",
- _("Copying files..."), thunar_vfs_copy_files,
- source_path_list, target_path_list, new_files_closure);
+ _("Copying files..."), thunar_io_jobs_copy_files,
+ source_file_list, target_file_list, new_files_closure);
}
-@@ -1199,7 +1199,7 @@ thunar_application_copy_into (ThunarApplication *application,
- _thunar_return_if_fail (target_path != NULL);
+@@ -1323,7 +1323,7 @@ thunar_application_copy_into (ThunarApplication *application,
+ g_free (display_name);
- /* collect the target paths and launch the job */
+ /* collect the target files and launch the job */
- thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
+ thunar_application_collect_and_launch (application, parent, "gtk-copy",
title, thunar_io_jobs_copy_files,
@@ -236,20 +39,20 @@
thunar_io_jobs_move_files,
source_file_list, target_file,
new_files_closure);
-@@ -1685,7 +1688,7 @@ thunar_application_restore_files (ThunarApplication *application,
- else if (G_LIKELY (response == GTK_RESPONSE_YES))
+@@ -1785,7 +1785,7 @@ thunar_application_restore_files (ThunarApplication *application,
+ else
{
/* launch the operation */
- thunar_application_launch (application, parent, "stock_folder-move",
+ thunar_application_launch (application, parent, "folder-move",
- _("Restoring files..."), thunar_vfs_move_files,
+ _("Restoring files..."), thunar_io_jobs_restore_files,
source_path_list, target_path_list, new_files_closure);
}
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
-index 0e36ee3..570efbe 100644
+index fecaac4..ae55dba 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
-@@ -602,7 +602,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
+@@ -586,7 +586,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);
Deleted: desktop/trunk/thunar/debian/patches/03_thunar-window-maximize.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/03_thunar-window-maximize.patch 2011-03-31 11:51:57 UTC (rev 5192)
+++ desktop/trunk/thunar/debian/patches/03_thunar-window-maximize.patch 2011-03-31 11:53:26 UTC (rev 5193)
@@ -1,75 +0,0 @@
-Index: thunar/thunar-preferences.c
-===================================================================
---- thunar/thunar-preferences.c (revision 28993)
-+++ thunar/thunar-preferences.c (working copy)
-@@ -68,6 +68,7 @@
- PROP_LAST_VIEW,
- PROP_LAST_WINDOW_HEIGHT,
- PROP_LAST_WINDOW_WIDTH,
-+ PROP_LAST_WINDOW_FULLSCREEN,
- PROP_MISC_VOLUME_MANAGEMENT,
- PROP_MISC_CASE_SENSITIVE,
- PROP_MISC_DATE_STYLE,
-@@ -436,6 +437,20 @@
- "last-window-width",
- 1, G_MAXINT, 640,
- EXO_PARAM_READWRITE));
-+
-+ /**
-+ * ThunarPreferences:last-window-maximized:
-+ *
-+ * The last known maximized state of a #ThunarWindow, which will be used as
-+ * default width for newly created windows.
-+ **/
-+ g_object_class_install_property (gobject_class,
-+ PROP_LAST_WINDOW_FULLSCREEN,
-+ g_param_spec_boolean ("last-window-maximized",
-+ "LastWindowMaximized",
-+ "last-window-maximized",
-+ FALSE,
-+ EXO_PARAM_READWRITE));
-
- /**
- * ThunarPreferences:misc-volume-management:
-Index: thunar/thunar-window.c
-===================================================================
---- thunar/thunar-window.c (revision 28993)
-+++ thunar/thunar-window.c (working copy)
-@@ -710,6 +710,7 @@
- gint position;
- gint width;
- gint height;
-+ gboolean maximized;
-
- /* grab a reference on the provider factory */
- window->provider_factory = thunarx_provider_factory_get_default ();
-@@ -805,8 +806,12 @@
- g_signal_connect_swapped (G_OBJECT (window->launcher), "change-directory", G_CALLBACK (thunar_window_set_current_directory), window);
-
- /* determine the default window size from the preferences */
-- g_object_get (G_OBJECT (window->preferences), "last-window-width", &width, "last-window-height", &height, NULL);
-+ g_object_get (G_OBJECT (window->preferences), "last-window-width", &width, "last-window-height", &height, "last-window-maximized", &maximized, NULL);
- gtk_window_set_default_size (GTK_WINDOW (window), width, height);
-+
-+ /* restore the maxized state of the window */
-+ if (G_UNLIKELY (maximized))
-+ gtk_window_maximize (GTK_WINDOW (window));
-
- window->table = gtk_table_new (6, 1, FALSE);
- gtk_container_add (GTK_CONTAINER (window), window->table);
-@@ -2491,8 +2496,14 @@
- gtk_window_get_size (GTK_WINDOW (window), &width, &height);
-
- /* ...and remember them as default for new windows */
-- g_object_set (G_OBJECT (window->preferences), "last-window-width", width, "last-window-height", height, NULL);
-+ g_object_set (G_OBJECT (window->preferences), "last-window-width", width, "last-window-height", height,
-+ "last-window-maximized", FALSE, NULL);
- }
-+ else
-+ {
-+ /* only store that the window is full screen */
-+ g_object_set (G_OBJECT (window->preferences), "last-window-maximized", TRUE, NULL);
-+ }
- }
- }
-
Deleted: desktop/trunk/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch 2011-03-31 11:51:57 UTC (rev 5192)
+++ desktop/trunk/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch 2011-03-31 11:53:26 UTC (rev 5193)
@@ -1,25 +0,0 @@
-From 58568697a90844d98c7602902df8084297f19c1b Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis at xfce.org>
-Date: Sun, 20 Dec 2009 13:42:21 +0000
-Subject: Avoid requesting drag data if target is GDK_NONE (bug #5771).
-
-Patch provided by k.blammo at gmail.com.
-
-Ported to thunar 1.0.1 for Xubuntu/Debian.
----
-diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
-index 83139fc..8661861 100644
---- a/thunar/thunar-standard-view.c
-+++ b/thunar/thunar-standard-view.c
-@@ -2857,7 +2858,8 @@ thunar_standard_view_drag_motion (GtkWidget *view,
- else
- {
- /* request the drag data from the source */
-- gtk_drag_get_data (view, context, target, time);
-+ if (target != GDK_NONE)
-+ gtk_drag_get_data (view, context, target, time);
- }
-
- /* tell Gdk whether we can drop here */
---
-cgit v0.8.2.1
Deleted: desktop/trunk/thunar/debian/patches/06_fix-sidepane-width.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/06_fix-sidepane-width.patch 2011-03-31 11:51:57 UTC (rev 5192)
+++ desktop/trunk/thunar/debian/patches/06_fix-sidepane-width.patch 2011-03-31 11:53:26 UTC (rev 5193)
@@ -1,23 +0,0 @@
-From 79bc169e0c90c74d21d21d3d73730001a72a2dcc Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis at xfce.org>
-Date: Fri, 18 Sep 2009 21:41:06 +0000
-Subject: Use g_utf8_strlen to calculate the sidepane width. Bugs #5390 and #3965.
-
-Using strlen() for the number of characters is unrealistic when dealing
-with multibyte strings.
----
-diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
-index 2ba4b61..c7df182 100644
---- a/thunar/thunar-shortcuts-view.c
-+++ b/thunar/thunar-shortcuts-view.c
-@@ -274,7 +274,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
- renderer = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT,
- "ellipsize-set", TRUE,
- "ellipsize", PANGO_ELLIPSIZE_END,
-- "width-chars", strlen (_("File System")),
-+ "width-chars", g_utf8_strlen (_("File System"), -1),
- NULL);
- g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (thunar_shortcuts_view_renamed), view);
- gtk_tree_view_column_pack_start (column, renderer, TRUE);
---
-cgit v0.8.2.1
Deleted: desktop/trunk/thunar/debian/patches/07_update-cursor-on-delete.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/07_update-cursor-on-delete.patch 2011-03-31 11:51:57 UTC (rev 5192)
+++ desktop/trunk/thunar/debian/patches/07_update-cursor-on-delete.patch 2011-03-31 11:53:26 UTC (rev 5193)
@@ -1,37 +0,0 @@
-From e49759d5b54c4f44c039648148c47d444ffded0f Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis at xfce.org>
-Date: Sat, 9 Jan 2010 22:36:15 +0100
-Subject: [PATCH 3/8] Properly update the cursor when a row is deleted in (bug #5361).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-When cursor and selection are out of sync weird things happen, as
-described by Jérôme in the bug comment on
-http://bugzilla.xfce.org/show_bug.cgi?id=5361.
----
- thunar/thunar-standard-view.c | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
-index 8661861..e6fb490 100644
---- a/thunar/thunar-standard-view.c
-+++ b/thunar/thunar-standard-view.c
-@@ -3019,10 +3019,12 @@ thunar_standard_view_restore_selection (ThunarListModel *model,
- * path is set by thunar_standard_view_row_deleted() if this is the case */
- if (G_LIKELY (standard_view->priv->selection_before_delete != NULL))
- {
-- /* Restore the selection by selecting either the row before or the new
-- * first row */
-+ /* Restore the selection by selecting either the row before or the new first row */
- (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->select_path) (standard_view, standard_view->priv->selection_before_delete);
-
-+ /* place the cursor on the selected path */
-+ (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->set_cursor) (standard_view, standard_view->priv->selection_before_delete, FALSE);
-+
- /* Free the tree path */
- gtk_tree_path_free (standard_view->priv->selection_before_delete);
- standard_view->priv->selection_before_delete = NULL;
---
-1.6.3.3
-
Deleted: desktop/trunk/thunar/debian/patches/08_refilter-tree-hidden-dir.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/08_refilter-tree-hidden-dir.patch 2011-03-31 11:51:57 UTC (rev 5192)
+++ desktop/trunk/thunar/debian/patches/08_refilter-tree-hidden-dir.patch 2011-03-31 11:53:26 UTC (rev 5193)
@@ -1,95 +0,0 @@
-From 49ca1071a69776bcbff3ae987dca79e99bbca15e Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis at xfce.org>
-Date: Sun, 10 Jan 2010 14:36:11 +0100
-Subject: [PATCH 4/8] Refilter the tree model when a hidden dir is entered/left (bug #6142).
-
-What's new is that instead of only refiltering when entering a directory
-that is within a hidden hierarchy, we now do the same when leaving a
-hidden directory or directory with hidden ancestor. This makes sure
-hidden directories are properly removed from the tree view side pane
-when hidden directories are turned off, unless you're browsing them.
----
- thunar/thunar-tree-view.c | 47 ++++++++++++++++++++++++++++++++++++++++----
- 1 files changed, 42 insertions(+), 5 deletions(-)
-
-diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
-index 3836a32..cfe1100 100644
---- a/thunar/thunar-tree-view.c
-+++ b/thunar/thunar-tree-view.c
-@@ -535,15 +535,46 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
- ThunarFile *current_directory)
- {
- ThunarTreeView *view = THUNAR_TREE_VIEW (navigator);
-- ThunarFile *file, *file_parent;
-+ ThunarFile *file;
-+ ThunarFile *file_parent;
-+ gboolean needs_refiltering = FALSE;
-
- /* check if we already use that directory */
- if (G_UNLIKELY (view->current_directory == current_directory))
- return;
-
-- /* disconnect from the previous current directory */
-+ /* check if we have an active directory */
- if (G_LIKELY (view->current_directory != NULL))
-- g_object_unref (G_OBJECT (view->current_directory));
-+ {
-+ /* update the filter if the old current directory, or one of it's parents, is hidden */
-+ if (!view->show_hidden)
-+ {
-+ /* look if the file or one of it's parents is hidden */
-+ for (file = g_object_ref (G_OBJECT (view->current_directory)); file != NULL; file = file_parent)
-+ {
-+ /* check if this file is hidden */
-+ if (thunar_file_is_hidden (file))
-+ {
-+ /* schedule an update of the filter after the current directory has been changed */
-+ needs_refiltering = TRUE;
-+
-+ /* release the file */
-+ g_object_unref (G_OBJECT (file));
-+
-+ break;
-+ }
-+
-+ /* get the file parent */
-+ file_parent = thunar_file_get_parent (file, NULL);
-+
-+ /* release the file */
-+ g_object_unref (G_OBJECT (file));
-+ }
-+ }
-+
-+ /* disconnect from the previous current directory */
-+ g_object_unref (G_OBJECT (view->current_directory));
-+ }
-
- /* activate the new current directory */
- view->current_directory = current_directory;
-@@ -554,8 +585,10 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
- /* take a reference on the directory */
- g_object_ref (G_OBJECT (current_directory));
-
-- /* update the filter if the new current directory, or one of it's parents, is hidden */
-- if (!view->show_hidden)
-+ /* update the filter if the new current directory, or one of it's parents, is
-+ * hidden. we don't have to check this unless refiltering needs to be done
-+ * anyway */
-+ if (!needs_refiltering && !view->show_hidden)
- {
- /* look if the file or one of it's parents is hidden */
- for (file = g_object_ref (G_OBJECT (current_directory)); file != NULL; file = file_parent)
-@@ -593,6 +626,10 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
- }
- }
-
-+ /* refilter the model if necessary */
-+ if (needs_refiltering)
-+ thunar_tree_model_refilter (view->model);
-+
- /* notify listeners */
- g_object_notify (G_OBJECT (view), "current-directory");
- }
---
-1.6.3.3
-
More information about the Pkg-xfce-commits
mailing list