[SCM] lives packaging branch, master, updated. debian/1.3.2-2-1-gdf3f444

[hrickards-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit df3f444a1a75aa1987899d42a22a2dee2db0871d
Author: Harry <hrickards at l33tmyst.com>
Date:   Sat Apr 17 17:01:31 2010 +0100

    Added two patches from upstream, fixing a crash in effect previews and an 'Are you sure' prompt

diff --git a/debian/patches/are_you_sure.diff b/debian/patches/are_you_sure.diff
new file mode 100644
index 0000000..0b23a60
--- /dev/null
+++ b/debian/patches/are_you_sure.diff
@@ -0,0 +1,17 @@
+Origin: http://lives.svn.sourceforge.net/viewvc/lives/trunk/src/callbacks.c?r1=489&r2=492&view=patch
+Description: Shows the "Are you sure ?" prompt when closing a changed clip.
+---
+ src/callbacks.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- lives.orig/src/callbacks.c	2010/03/28 21:31:36	489
++++ lives/src/callbacks.c	2010/03/30 16:15:51	492
+@@ -713,7 +713,7 @@
+       }
+     }
+   }
+-  else {
++  if (!lmap_errors) {
+     if (cfile->changed) {
+       get_menu_text(cfile->menuentry,title);
+       if (strlen(title)>128) g_snprintf(title,32,"%s",(_("This file"))); 
diff --git a/debian/patches/effect_previews_fix.diff b/debian/patches/effect_previews_fix.diff
new file mode 100644
index 0000000..a6d6b4a
--- /dev/null
+++ b/debian/patches/effect_previews_fix.diff
@@ -0,0 +1,19 @@
+Origin: http://lives.svn.sourceforge.net/viewvc/lives/trunk/src/cvirtual.c?r1=394&r2=492&view=patch
+Description: Fixes a rare crash in effect previews
+---
+ src/cvirtual.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+--- lives.orig/src/cvirtual.c
++++ lives/src/cvirtual.c
+@@ -207,6 +207,9 @@
+ 
+       if (pixbuf!=NULL) gdk_pixbuf_unref(pixbuf);
+       pixbuf=NULL;
++
++      // another thread may have called check_if_non_virtual
++      if (sfile->frame_index==NULL) break;
+       sfile->frame_index[i-1]=-1;
+     }
+     pthread_mutex_unlock(&mainw->gtk_mutex);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4d3cf38..7f3a3f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 cdda2wav_to_icedax.diff
 removepy.diff
 makefile_am.diff
+effect_previews_fix.diff
+are_you_sure.diff

-- 
lives packaging