[SCM] lives/master: Second attempt to fix FTBFS on kfreebsd.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 81b03ac5ad489c58a5f496cd2fdc3da8d3fbe75a
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Feb 3 10:59:41 2012 +0100

    Second attempt to fix FTBFS on kfreebsd.

diff --git a/debian/patches/91-lives_160_ftbfs.patch b/debian/patches/91-lives_160_ftbfs.patch
index 20cd298..ae339b5 100644
--- a/debian/patches/91-lives_160_ftbfs.patch
+++ b/debian/patches/91-lives_160_ftbfs.patch
@@ -1,9 +1,11 @@
 Description: Attempt to fix FTBFS on kfreebsd.
 From: http://lives.svn.sf.net/viewvc/lives/trunk/src/callbacks.c?r1=1324&r2=1327
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657775
+Applied-Upstream:
+ http://lives.svn.sf.net/viewvc/lives/trunk/src/callbacks.c?r1=1327&r2=1341
 ---
- src/callbacks.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ src/callbacks.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 --- lives.orig/src/callbacks.c
 +++ lives/src/callbacks.c
@@ -18,3 +20,14 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657775
        return;
      }
  
+@@ -5872,7 +5874,9 @@ void on_fs_preview_clicked (GtkButton *b
+       xwin=(unsigned int)GDK_WINDOW_XID (mainw->fs_playarea->window);
+ #else
+       // need equivalent to get XID of win on other platforms
+-      do_blocking_error_dialog(_("Preview will not work without X11. We need the window id of the preview window.\nPlease send a patch if you know how to do this.\n"
++      msg=g_strdup(_("Preview will not work without X11. We need the window id of the preview window.\nPlease send a patch if you know how to do this.\n"));
++      do_blocking_error_dialog(msg);
++      g_free(msg);
+ #endif
+ 
+     }

-- 
lives packaging