r41708 - in /desktop/unstable/totem/debian: changelog control.in patches/fix-potential-data-loss.patch patches/series

ah at users.alioth.debian.org ah at users.alioth.debian.org
Fri May 16 10:45:28 UTC 2014 

Author: ah
Date: Fri May 16 10:45:27 2014
New Revision: 41708

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41708
Log:
* New upstream release.
* Bump Standards-Version to 3.9.5
* Bump build-dependencies according to configure.ac changes:
  - libclutter-gtk-1.0-dev (>= 1.5.2)
  - libgstreamer1.0-dev (>= 1.2.4)
* Add debian/patches/fix-potential-data-loss.patch
  - cherry-picked from upstream git
  - "Fix potential data loss when removing multiple files"
  - https://mail.gnome.org/archives/desktop-devel-list/2014-May/msg00014.html

Added:
    desktop/unstable/totem/debian/patches/fix-potential-data-loss.patch
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/control.in
    desktop/unstable/totem/debian/patches/series

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=41708&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog	[utf-8] (original)
+++ desktop/unstable/totem/debian/changelog	[utf-8] Fri May 16 10:45:27 2014
@@ -1,3 +1,17 @@
+totem (3.12.1-1) unstable; urgency=high
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5
+  * Bump build-dependencies according to configure.ac changes:
+    - libclutter-gtk-1.0-dev (>= 1.5.2)
+    - libgstreamer1.0-dev (>= 1.2.4)
+  * Add debian/patches/fix-potential-data-loss.patch
+    - cherry-picked from upstream git
+    - "Fix potential data loss when removing multiple files"
+    - https://mail.gnome.org/archives/desktop-devel-list/2014-May/msg00014.html
+
+ -- Andreas Henriksson <andreas at fatal.se>  Fri, 16 May 2014 09:56:51 +0200
+
 totem (3.12.0-2) unstable; urgency=medium
 
   * Upload to unstable.

Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=41708&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in	[utf-8] (original)
+++ desktop/unstable/totem/debian/control.in	[utf-8] Fri May 16 10:45:27 2014
@@ -21,7 +21,7 @@
                libatk1.0-dev (>= 1.29.4),
                libbluetooth-dev [linux-any],
                libclutter-gst-2.0-dev,
-               libclutter-gtk-1.0-dev,
+               libclutter-gtk-1.0-dev (>= 1.5.2),
                libclutter-1.0-dev (>= 1.17.3),
                libdbus-glib-1-dev (>= 0.82),
                libepc-ui-dev (>= 0.4.0),
@@ -31,7 +31,7 @@
                libglib2.0-dev (>= 2.33.0),
                libgrilo-0.2-dev (>= 0.2.9),
                libgstreamer-plugins-base1.0-dev,
-               libgstreamer1.0-dev,
+               libgstreamer1.0-dev (>= 1.2.4),
                libgtk-3-dev (>= 3.11.5),
                liblircclient-dev (>= 0.6.6),
                libnautilus-extension-dev (>= 2.91.4),
@@ -50,7 +50,7 @@
                valac (>= 0.14.1),
                x11proto-core-dev,
                yelp-tools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: https://wiki.gnome.org/Apps/Videos
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/totem
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/totem

Added: desktop/unstable/totem/debian/patches/fix-potential-data-loss.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/fix-potential-data-loss.patch?rev=41708&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/fix-potential-data-loss.patch	(added)
+++ desktop/unstable/totem/debian/patches/fix-potential-data-loss.patch	[utf-8] Fri May 16 10:45:27 2014
@@ -0,0 +1,72 @@
+From b469c525e1cf6fd1a34dce18503afed86e9fcf6b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 15 May 2014 19:28:35 +0200
+Subject: main: Fix potential data loss when removing multiple files
+
+We were using a list of GtkTreePaths and deleting the items one-by-one
+when the user clicked the "Delete" button. But after the first deletion,
+the tree model would have changed, and instead of pointing to the 2nd
+item we wanted to delete, the GtkTreePath would have pointed to another
+item, usually not one that we wanted to delete.
+
+We now use GtkTreeRowReferences, which will always point to the same
+row, as long as it exists.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=729778
+
+diff --git a/src/totem-grilo.c b/src/totem-grilo.c
+index 88cac19..98730c4 100644
+--- a/src/totem-grilo.c
++++ b/src/totem-grilo.c
+@@ -2068,7 +2068,8 @@ static void
+ delete_foreach (gpointer data,
+ 		gpointer user_data)
+ {
+-	GtkTreePath *path = data;
++	GtkTreeRowReference *ref = data;
++	GtkTreePath *path;
+ 	GtkTreeModel *view_model = user_data;
+ 	GtkTreeIter iter;
+ 	GrlSource *source;
+@@ -2079,8 +2080,11 @@ delete_foreach (gpointer data,
+ 	GtkTreeModel *model;
+ 	GtkTreeIter real_model_iter;
+ 
+-	if (!gtk_tree_model_get_iter (view_model, &iter, path))
++	path = gtk_tree_row_reference_get_path (ref);
++	if (!path || !gtk_tree_model_get_iter (view_model, &iter, path)) {
++		g_warning ("An item that was scheduled for removal isn't available any more");
+ 		return;
++	}
+ 
+ 	gtk_tree_model_get (view_model, &iter,
+ 			    MODEL_RESULTS_CONTENT, &media,
+@@ -2145,14 +2149,23 @@ delete_cb (TotemSelectionToolbar *bar,
+ 	   TotemGrilo            *self)
+ {
+ 	GtkTreeModel *model;
+-	GList *list;
++	GList *list, *l;
+ 
+ 	g_signal_handlers_block_by_func (self->priv->browser, "view-selection-changed", self);
+ 
+ 	model = gd_main_view_get_model (GD_MAIN_VIEW (self->priv->browser));
+ 	list = gd_main_view_get_selection (GD_MAIN_VIEW (self->priv->browser));
++
++	/* GList of GtkTreePaths to a GList of GtkTreeRowReferences */
++	for (l = list; l != NULL; l = l->next) {
++		GtkTreeRowReference *ref;
++
++		ref = gtk_tree_row_reference_new (model, l->data);
++		gtk_tree_path_free (l->data);
++		l->data = ref;
++	}
+ 	g_list_foreach (list, delete_foreach, model);
+-	g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
++	g_list_free_full (list, (GDestroyNotify) gtk_tree_row_reference_free);
+ 
+ 	g_signal_handlers_unblock_by_func (self->priv->browser, "view-selection-changed", self);
+ 
+-- 
+cgit v0.10.1
+

Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=41708&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series	[utf-8] Fri May 16 10:45:27 2014
@@ -0,0 +1 @@
+fix-potential-data-loss.patch

More information about the pkg-gnome-commits mailing list