[Pkg-xfce-commits] r4342 - in desktop/branches/experimental/thunar-vfs/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Tue Nov 2 10:42:33 UTC 2010
Author: mrpouit-guest
Date: 2010-11-02 22:42:28 +0000 (Tue, 02 Nov 2010)
New Revision: 4342
Removed:
desktop/branches/experimental/thunar-vfs/debian/bluetooth-sendto.desktop
desktop/branches/experimental/thunar-vfs/debian/gnome-obex-send.desktop
desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.lintian-overrides
desktop/branches/experimental/thunar-vfs/debian/patches/01_thunar-help-directory.patch
desktop/branches/experimental/thunar-vfs/debian/patches/03_thunar-window-maximize.patch
desktop/branches/experimental/thunar-vfs/debian/patches/05_fix-crash-drag-gdk-none.patch
desktop/branches/experimental/thunar-vfs/debian/patches/06_fix-sidepane-width.patch
desktop/branches/experimental/thunar-vfs/debian/patches/07_update-cursor-on-delete.patch
desktop/branches/experimental/thunar-vfs/debian/patches/08_refilter-tree-hidden-dir.patch
desktop/branches/experimental/thunar-vfs/debian/thunar-data.docs
desktop/branches/experimental/thunar-vfs/debian/thunar-data.install
desktop/branches/experimental/thunar-vfs/debian/thunar.1
desktop/branches/experimental/thunar-vfs/debian/thunar.install
desktop/branches/experimental/thunar-vfs/debian/thunar.manpages
desktop/branches/experimental/thunar-vfs/debian/thunar.menu
desktop/branches/experimental/thunar-vfs/debian/thunar.postinst
desktop/branches/experimental/thunar-vfs/debian/xfprint.desktop
Log:
drop obsolete files
Deleted: desktop/branches/experimental/thunar-vfs/debian/bluetooth-sendto.desktop
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/bluetooth-sendto.desktop 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/bluetooth-sendto.desktop 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Bluetooth recipient
-Icon=stock_mailto
-Exec=bluetooth-sendto %F
-TryExec=bluetooth-sendto
Deleted: desktop/branches/experimental/thunar-vfs/debian/gnome-obex-send.desktop
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/gnome-obex-send.desktop 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/gnome-obex-send.desktop 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Gnome Bluetooth OBEX Recipient
-Icon=stock_mailto
-Exec=gnome-obex-send %F
-TryExec=gnome-obex-send
Deleted: desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.lintian-overrides
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.lintian-overrides 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.lintian-overrides 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,2 +0,0 @@
-#private
-libthunar-vfs-1-2: package-name-doesnt-match-sonames libthunar-vfs-1-2 libthunarx-1-0
Deleted: desktop/branches/experimental/thunar-vfs/debian/patches/01_thunar-help-directory.patch
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/patches/01_thunar-help-directory.patch 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/patches/01_thunar-help-directory.patch 2010-11-02 22:42:28 UTC (rev 4342)
@@ -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
Deleted: desktop/branches/experimental/thunar-vfs/debian/patches/03_thunar-window-maximize.patch
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/patches/03_thunar-window-maximize.patch 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/patches/03_thunar-window-maximize.patch 2010-11-02 22:42:28 UTC (rev 4342)
@@ -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/branches/experimental/thunar-vfs/debian/patches/05_fix-crash-drag-gdk-none.patch
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/patches/05_fix-crash-drag-gdk-none.patch 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/patches/05_fix-crash-drag-gdk-none.patch 2010-11-02 22:42:28 UTC (rev 4342)
@@ -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/branches/experimental/thunar-vfs/debian/patches/06_fix-sidepane-width.patch
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/patches/06_fix-sidepane-width.patch 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/patches/06_fix-sidepane-width.patch 2010-11-02 22:42:28 UTC (rev 4342)
@@ -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/branches/experimental/thunar-vfs/debian/patches/07_update-cursor-on-delete.patch
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/patches/07_update-cursor-on-delete.patch 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/patches/07_update-cursor-on-delete.patch 2010-11-02 22:42:28 UTC (rev 4342)
@@ -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/branches/experimental/thunar-vfs/debian/patches/08_refilter-tree-hidden-dir.patch
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/patches/08_refilter-tree-hidden-dir.patch 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/patches/08_refilter-tree-hidden-dir.patch 2010-11-02 22:42:28 UTC (rev 4342)
@@ -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
-
Deleted: desktop/branches/experimental/thunar-vfs/debian/thunar-data.docs
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/thunar-data.docs 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/thunar-data.docs 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,3 +0,0 @@
-debian/README.Debian
-FAQ
-HACKING
Deleted: desktop/branches/experimental/thunar-vfs/debian/thunar-data.install
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/thunar-data.install 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/thunar-data.install 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,2 +0,0 @@
-debian/tmp/etc/*
-debian/tmp/usr/share/*
Deleted: desktop/branches/experimental/thunar-vfs/debian/thunar.1
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/thunar.1 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/thunar.1 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1 +0,0 @@
-.so man1/Thunar.1
Deleted: desktop/branches/experimental/thunar-vfs/debian/thunar.install
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/thunar.install 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/thunar.install 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,4 +0,0 @@
-debian/tmp/usr/bin/*
-debian/tmp/usr/lib/thunar/*
-debian/tmp/usr/share/applications/*
-debian/tmp/usr/share/xfce4/panel-plugins/thunar-tpa.desktop
Deleted: desktop/branches/experimental/thunar-vfs/debian/thunar.manpages
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/thunar.manpages 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/thunar.manpages 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,2 +0,0 @@
-debian/thunar.1
-docs/Thunar.1
Deleted: desktop/branches/experimental/thunar-vfs/debian/thunar.menu
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/thunar.menu 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/thunar.menu 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,2 +0,0 @@
-?package(thunar):needs="X11" section="Applications/File Management"\
- title="Thunar" longtitle="Xfce4 File Manager" hints="File manager" command="/usr/bin/thunar"
Deleted: desktop/branches/experimental/thunar-vfs/debian/thunar.postinst
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/thunar.postinst 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/thunar.postinst 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" eq "1.0.0-2";
-then
- cd /usr/share/doc/thunar && rm -f thunar-data
-fi
-
-#DEBHELPER#
-
-exit 0
Deleted: desktop/branches/experimental/thunar-vfs/debian/xfprint.desktop
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/xfprint.desktop 2010-11-02 22:39:00 UTC (rev 4341)
+++ desktop/branches/experimental/thunar-vfs/debian/xfprint.desktop 2010-11-02 22:42:28 UTC (rev 4342)
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Printer
-Exec=xfprint4 %f
-Icon=printer
-TryExec=xfprint4
More information about the Pkg-xfce-commits
mailing list