[Pkg-xfce-commits] r2597 - in desktop/branches/svn-snapshots/thunar/debian: . patches
corsac at alioth.debian.org
corsac at alioth.debian.org
Wed Jan 14 09:05:12 UTC 2009
Author: corsac
Date: 2009-01-14 09:05:12 +0000 (Wed, 14 Jan 2009)
New Revision: 2597
Removed:
desktop/branches/svn-snapshots/thunar/debian/patches/02_fix-fam-closing-treeview.patch
desktop/branches/svn-snapshots/thunar/debian/patches/03_eject-handling.patch
desktop/branches/svn-snapshots/thunar/debian/patches/04_fix-listview-focus-delete.patch
Modified:
desktop/branches/svn-snapshots/thunar/debian/changelog
desktop/branches/svn-snapshots/thunar/debian/control
desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.shlibs
Log:
is_ejectable=true. (Xfce r28895, #3978)
a file in detailed list view. (Xfce r28902, #3884)
* new upstream beta release.
- correctly close folders in treeview. closes: #478566
- display “eject” if and only if device has is_ejectable. closes: #500561
- fix focus problem when deleting in detailed list view. closes: #446810
* debian/control:
- update build-deps for “Tuco-Tuco”.
- add build-dep on intltool.
* debian/libthunar-vfs-1-2.shlibs: bump shlibs.
* debian/patches:
- 02_fix-fam-closing-treeview dropped, merged upstream.
- 03_eject-handling as well.
- 04_fix-listview-focus-deleted finally.
Modified: desktop/branches/svn-snapshots/thunar/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/changelog 2009-01-14 09:04:54 UTC (rev 2596)
+++ desktop/branches/svn-snapshots/thunar/debian/changelog 2009-01-14 09:05:12 UTC (rev 2597)
@@ -1,4 +1,4 @@
-thunar (0.9.92-1) UNRELEASED; urgency=low
+thunar (0.9.93-1) UNRELEASED; urgency=low
[ Xfce 4.6 Alpha “Pinkie” ]
* new upstream alpha release.
@@ -27,14 +27,27 @@
- bump shlibs for Hopper.
* debian/patches:
- 02_fix-fam-closing-treeview added, fix file monitoring in treeview.
- closes: #478566
- 03_eject-handling added, display eject if and only if
- is_ejectable=true. (Xfce r28895, #3978) closes: #500561
+ is_ejectable=true. (Xfce r28895, #3978)
- 04_fix-listview-focus-deleted added, fix focus problem when deleting
- a file in detailed list view. (Xfce r28902, #3884) closes: #446810
+ a file in detailed list view. (Xfce r28902, #3884)
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 25 Nov 2008 07:53:37 +0100
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ - correctly close folders in treeview. closes: #478566
+ - display “eject” if and only if device has is_ejectable. closes: #500561
+ - fix focus problem when deleting in detailed list view. closes: #446810
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ - add build-dep on intltool.
+ * debian/libthunar-vfs-1-2.shlibs: bump shlibs.
+ * debian/patches:
+ - 02_fix-fam-closing-treeview dropped, merged upstream.
+ - 03_eject-handling as well.
+ - 04_fix-listview-focus-deleted finally.
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 12 Jan 2009 23:18:23 +0100
+
thunar (0.9.0-10) unstable; urgency=low
* -dev package doesn't need to depend on exo-utils, thunar does.
Modified: desktop/branches/svn-snapshots/thunar/debian/control
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/control 2009-01-14 09:04:54 UTC (rev 2596)
+++ desktop/branches/svn-snapshots/thunar/debian/control 2009-01-14 09:05:12 UTC (rev 2597)
@@ -3,7 +3,12 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
-Build-Depends: debhelper (>= 5.0.0), libcairo2-dev, libexo-0.3-dev (>= 0.3.92), cdbs, libxml-parser-perl, libfam-dev, libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.5.92), chrpath, libpcre3-dev, libjpeg62-dev
+Build-Depends: debhelper (>= 5.0.0), libcairo2-dev,
+ libexo-0.3-dev (>= 0.3.93), cdbs, libxml-parser-perl, libfam-dev,
+ libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
+ xfce4-panel-dev (>= 4.5.93), chrpath, libpcre3-dev, libjpeg62-dev,
+ intltool
Build-Conflicts: libgamin-dev [!hurd-i386]
Standards-Version: 3.8.0
Homepage: http://thunar.xfce.org
@@ -13,7 +18,7 @@
Package: libthunar-vfs-1-dev
Section: libdevel
Architecture: any
-Depends: libthunar-vfs-1-2 (= ${binary:Version}), libexo-0.3-dev (>= 0.3.4), thunar-data (= ${source:Version})
+Depends: libthunar-vfs-1-2 (= ${binary:Version}), libexo-0.3-dev (>= 0.3.93), thunar-data (= ${source:Version})
Description: Development files for libthunar-vfs
This package contains the headers and the static library for libthunar-vfs,
the virtual file system abstraction used by thunar
@@ -25,7 +30,7 @@
Replaces: libthunar-vfs-1
Description: VFS abstraction used in thunar
This package contains a library for virtual file system abstraction. It's
- used by thunar, the file manager of Xfce 4.4
+ used by thunar, the file manager of Xfce 4.6
Package: thunar
Architecture: any
@@ -35,7 +40,7 @@
Conflicts: thunar-data (<= 0.9.0-5)
Suggests: thunar-archive-plugin, thunar-media-tags-plugin
Description: File Manager for Xfce
- Thunar is the file manager designed to be the default file manager of Xfce 4.4
+ Thunar is the file manager designed to be the default file manager of Xfce 4.6
It has been designed to be fast and easy to use.
.
A Xfce plugin can manages the trash, if xfce4-panel is installed as well.
Modified: desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.shlibs
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.shlibs 2009-01-14 09:04:54 UTC (rev 2596)
+++ desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.shlibs 2009-01-14 09:05:12 UTC (rev 2597)
@@ -1,2 +1,2 @@
-libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 0.9.92)
-libthunarx-1 2 libthunar-vfs-1-2 (>= 0.9.92)
+libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 0.9.93)
+libthunarx-1 2 libthunar-vfs-1-2 (>= 0.9.93)
Deleted: desktop/branches/svn-snapshots/thunar/debian/patches/02_fix-fam-closing-treeview.patch
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/patches/02_fix-fam-closing-treeview.patch 2009-01-14 09:04:54 UTC (rev 2596)
+++ desktop/branches/svn-snapshots/thunar/debian/patches/02_fix-fam-closing-treeview.patch 2009-01-14 09:05:12 UTC (rev 2597)
@@ -1,85 +0,0 @@
-Index: thunar/thunar-tree-model.c
-===================================================================
---- thunar/thunar-tree-model.c (revision 28788)
-+++ thunar/thunar-tree-model.c (working copy)
-@@ -178,6 +178,12 @@
- gboolean sort_case_sensitive;
-
- GNode *root;
-+
-+ /* when this setting is enabled, we do not ref nodes. this is
-+ * used to avoid a race condition when gtk traverses the tree
-+ * and reads the iter data. See bug #2502.
-+ */
-+ gboolean lock_ref_node;
- };
-
- struct _ThunarTreeModelItem
-@@ -307,6 +313,7 @@
-
- /* initialize the model data */
- model->sort_case_sensitive = TRUE;
-+ model->lock_ref_node = FALSE;
-
- /* connect to the file monitor */
- model->file_monitor = thunar_file_monitor_get_default ();
-@@ -760,6 +767,10 @@
- _thunar_return_if_fail (iter->user_data != NULL);
- _thunar_return_if_fail (iter->stamp == model->stamp);
-
-+ /* leave when locked */
-+ if (model->lock_ref_node)
-+ return;
-+
- /* determine the node for the iterator */
- node = G_NODE (iter->user_data);
- if (G_UNLIKELY (node == model->root))
-@@ -1699,3 +1710,13 @@
- }
- }
-
-+
-+
-+void
-+thunar_tree_model_set_lock_ref_node (ThunarTreeModel *model,
-+ gboolean lock_ref_node)
-+{
-+ _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
-+
-+ model->lock_ref_node = !!lock_ref_node;
-+}
-Index: thunar/thunar-tree-model.h
-===================================================================
---- thunar/thunar-tree-model.h (revision 28788)
-+++ thunar/thunar-tree-model.h (working copy)
-@@ -61,6 +61,9 @@
- void thunar_tree_model_set_case_sensitive (ThunarTreeModel *model,
- gboolean case_sensitive);
-
-+void thunar_tree_model_set_lock_ref_node (ThunarTreeModel *model,
-+ gboolean lock_ref_node);
-+
- G_END_DECLS;
-
- #endif /* !__THUNAR_TREE_MODEL_H__ */
-Index: thunar/thunar-tree-view.c
-===================================================================
---- thunar/thunar-tree-view.c (revision 28788)
-+++ thunar/thunar-tree-view.c (working copy)
-@@ -2133,10 +2133,16 @@
- /* apply the new setting */
- view->show_hidden = show_hidden;
-
-+ /* lock loading nodes in the tree, see bug #2505 */
-+ thunar_tree_model_set_lock_ref_node (THUNAR_TREE_MODEL (view->model), TRUE);
-+
- /* update the filter */
- filter = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter));
-
-+ /* release the lock */
-+ thunar_tree_model_set_lock_ref_node (THUNAR_TREE_MODEL (view->model), FALSE);
-+
- /* notify listeners */
- g_object_notify (G_OBJECT (view), "show-hidden");
- }
Deleted: desktop/branches/svn-snapshots/thunar/debian/patches/03_eject-handling.patch
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/patches/03_eject-handling.patch 2009-01-14 09:04:54 UTC (rev 2596)
+++ desktop/branches/svn-snapshots/thunar/debian/patches/03_eject-handling.patch 2009-01-14 09:05:12 UTC (rev 2597)
@@ -1,27 +0,0 @@
-commit 1d29095a26262c76aeeb2a2a54832bddba38eef5
-Author: jannis <jannis at a0aa69c2-05f4-0310-b83c-d5d913b14636>
-Date: Sun Nov 23 18:59:06 2008 +0000
-
- * thunar-vfs/thunar-vfs-volume-hal.c
- (thunar_vfs_volume_hal_is_ejectable): Return TRUE if and only if
- requires_eject is TRUE. This should fix bug #3978.
-
- git-svn-id: http://svn.xfce.org/svn/xfce/thunar/trunk@28895 a0aa69c2-05f4-0310-b83c-d5d913b14636
-
-diff --git a/thunar-vfs/thunar-vfs-volume-hal.c b/thunar-vfs/thunar-vfs-volume-hal.c
-index 70b72c4..44202b7 100644
---- a/thunar-vfs/thunar-vfs-volume-hal.c
-+++ b/thunar-vfs/thunar-vfs-volume-hal.c
-@@ -208,11 +208,7 @@ static gboolean
- thunar_vfs_volume_hal_is_ejectable (ThunarVfsVolume *volume)
- {
- /* check if HAL drive requires eject */
-- if (THUNAR_VFS_VOLUME_HAL (volume)->requires_eject)
-- return TRUE;
--
-- /* otherwise we can only eject removable media, that are present (surprise, surprise) */
-- return (thunar_vfs_volume_is_present (volume) && thunar_vfs_volume_is_removable (volume));
-+ return THUNAR_VFS_VOLUME_HAL (volume)->requires_eject;
- }
-
-
Deleted: desktop/branches/svn-snapshots/thunar/debian/patches/04_fix-listview-focus-delete.patch
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/patches/04_fix-listview-focus-delete.patch 2009-01-14 09:04:54 UTC (rev 2596)
+++ desktop/branches/svn-snapshots/thunar/debian/patches/04_fix-listview-focus-delete.patch 2009-01-14 09:05:12 UTC (rev 2597)
@@ -1,144 +0,0 @@
-commit 7cb4fcded54a3eb0c1e3362ddcc2395562ed1323
-Author: jannis <jannis at a0aa69c2-05f4-0310-b83c-d5d913b14636>
-Date: Tue Nov 25 01:03:40 2008 +0000
-
- * thunar/thunar-standard-view.c: Restore the selection after deleting
- a file/folder. This is done by connecting to the "row-deleted"
- signal of the model twice. The first handler saves the tree path to
- be selected after the removal in the selection_before_delete member.
- The second handler (which is called after the signal is emitted)
- selects this path. Selection is not modified if there are two or
- more files selected.
-
- git-svn-id: http://svn.xfce.org/svn/xfce/thunar/trunk@28902 a0aa69c2-05f4-0310-b83c-d5d913b14636
-
-diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
-index 5787903..a43428f 100644
---- a/thunar/thunar-standard-view.c
-+++ b/thunar/thunar-standard-view.c
-@@ -240,6 +240,12 @@ static void thunar_standard_view_drag_data_delete (Gtk
- static void thunar_standard_view_drag_end (GtkWidget *view,
- GdkDragContext *context,
- ThunarStandardView *standard_view);
-+static void thunar_standard_view_row_deleted (ThunarListModel *model,
-+ GtkTreePath *path,
-+ ThunarStandardView *standard_view);
-+static void thunar_standard_view_restore_selection (ThunarListModel *model,
-+ GtkTreePath *path,
-+ ThunarStandardView *standard_view);
- static void thunar_standard_view_error (ThunarListModel *model,
- const GError *error,
- ThunarStandardView *standard_view);
-@@ -312,6 +318,10 @@ struct _ThunarStandardViewPrivate
- guint scroll_to_use_align : 1;
- gfloat scroll_to_row_align;
- gfloat scroll_to_col_align;
-+
-+ /* Tree path for restoring the selection after selecting and
-+ * deleting an item */
-+ GtkTreePath *selection_before_delete;
- };
-
-
-@@ -555,6 +565,8 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
- standard_view->priv->drag_scroll_timer_id = -1;
- standard_view->priv->drag_timer_id = -1;
-
-+ standard_view->priv->selection_before_delete = NULL;
-+
- /* grab a reference on the preferences */
- standard_view->preferences = thunar_preferences_get ();
-
-@@ -602,6 +614,8 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
-
- /* setup the list model */
- standard_view->model = thunar_list_model_new ();
-+ g_signal_connect (G_OBJECT (standard_view->model), "row-deleted", G_CALLBACK (thunar_standard_view_row_deleted), standard_view);
-+ g_signal_connect_after (G_OBJECT (standard_view->model), "row-deleted", G_CALLBACK (thunar_standard_view_restore_selection), standard_view);
- g_signal_connect (G_OBJECT (standard_view->model), "error", G_CALLBACK (thunar_standard_view_error), standard_view);
- exo_binding_new (G_OBJECT (standard_view->preferences), "misc-case-sensitive", G_OBJECT (standard_view->model), "case-sensitive");
- exo_binding_new (G_OBJECT (standard_view->preferences), "misc-date-style", G_OBJECT (standard_view->model), "date-style");
-@@ -1142,7 +1156,7 @@ thunar_standard_view_set_current_directory (ThunarNavigator *navigator,
-
- _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- _thunar_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
--
-+
- /* disconnect any previous "loading" binding */
- if (G_LIKELY (standard_view->loading_binding != NULL))
- exo_binding_unbind (standard_view->loading_binding);
-@@ -3004,6 +3018,74 @@ thunar_standard_view_drag_end (GtkWidget *view,
-
-
- static void
-+thunar_standard_view_row_deleted (ThunarListModel *model,
-+ GtkTreePath *path,
-+ ThunarStandardView *standard_view)
-+{
-+ GtkTreePath *path_copy = NULL;
-+ GList *selected_items;
-+
-+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (model));
-+ _thunar_return_if_fail (path != NULL);
-+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
-+ _thunar_return_if_fail (standard_view->model == model);
-+
-+ /* Get tree paths of selected files */
-+ selected_items = (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->get_selected_items) (standard_view);
-+
-+ /* Do nothing if the deleted row is not selected or there is more than one file selected */
-+ if (G_UNLIKELY (g_list_find_custom (selected_items, path, (GCompareFunc) gtk_tree_path_compare) == NULL || g_list_length (selected_items) != 1))
-+ {
-+ g_list_foreach (selected_items, (GFunc) gtk_tree_path_free, NULL);
-+ g_list_free (selected_items);
-+ return;
-+ }
-+
-+ /* Create a copy the path (we're not allowed to modify it in this handler) */
-+ path_copy = gtk_tree_path_copy (path);
-+
-+ /* Remember the selected path so that it can be restored after the row has
-+ * been removed. If the first row is removed, select the first row after the
-+ * removal, if any other row is removed, select the row before that one */
-+ if (G_LIKELY (gtk_tree_path_prev (path_copy)))
-+ standard_view->priv->selection_before_delete = gtk_tree_path_copy (path_copy);
-+ else
-+ standard_view->priv->selection_before_delete = gtk_tree_path_copy (path_copy);
-+
-+ /* Free path list */
-+ g_list_foreach (selected_items, (GFunc) gtk_tree_path_free, NULL);
-+ g_list_free (selected_items);
-+}
-+
-+
-+
-+static void
-+thunar_standard_view_restore_selection (ThunarListModel *model,
-+ GtkTreePath *path,
-+ ThunarStandardView *standard_view)
-+{
-+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (model));
-+ _thunar_return_if_fail (path != NULL);
-+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
-+ _thunar_return_if_fail (standard_view->model == model);
-+
-+ /* Check if there was only one file selected before the row was deleted. The
-+ * 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 */
-+ (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->select_path) (standard_view, standard_view->priv->selection_before_delete);
-+
-+ /* Free the tree path */
-+ gtk_tree_path_free (standard_view->priv->selection_before_delete);
-+ standard_view->priv->selection_before_delete = NULL;
-+ }
-+}
-+
-+
-+
-+static void
- thunar_standard_view_error (ThunarListModel *model,
- const GError *error,
- ThunarStandardView *standard_view)
More information about the Pkg-xfce-commits
mailing list