[SCM] jack-keyboard/master: Don't show an error dialog when LASH is not available, just print a warning to stderr.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fbcd1b0adf9b619b16342206ecd3e5b32e64ebc4
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 12 19:22:14 2011 +0200

    Don't show an error dialog when LASH is not available, just print a warning to stderr.
    
    - We're going to drop LASH in favor of ladish, so such dialog will be
      inappropriate.

diff --git a/debian/patches/2001-hide_no_lash_warning.patch b/debian/patches/2001-hide_no_lash_warning.patch
new file mode 100644
index 0000000..8031946
--- /dev/null
+++ b/debian/patches/2001-hide_no_lash_warning.patch
@@ -0,0 +1,20 @@
+Description: Don't show an error dialog, just print a warning to the stderr.
+ We're going to drop LASH in favor of ladish, so such dialog will be
+ inappropriate.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ src/jack-keyboard.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- jack-keyboard.orig/src/jack-keyboard.c
++++ jack-keyboard/src/jack-keyboard.c
+@@ -948,7 +948,7 @@ init_lash(lash_args_t *args)
+ 	lash_client = lash_init(args, PACKAGE_NAME, LASH_Config_Data_Set, LASH_PROTOCOL(2, 0));
+ 
+ 	if (!lash_server_connected(lash_client)) {
+-		g_critical("Cannot initialize LASH.  Continuing anyway.");
++		fprintf(stderr, "jack-keyboard: Cannot initialize LASH.  Continuing anyway.\n");
+ 		/* exit(EX_UNAVAILABLE); */
+ 
+ 		return;
diff --git a/debian/patches/series b/debian/patches/series
index e4c0a1c..ae6fecc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-desktop_file.patch
 0005-fix_pianola_mode.patch
 1001-manpage_errors.patch
+2001-hide_no_lash_warning.patch

-- 
jack-keyboard packaging