[med-svn] [SCM] aghermann branch, master, updated. f0d4c0fd35bf09e7dff56ddb9a2d798ae916c2ef

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 878bb215e3f0c5d360732e5092811c5cf7a38f78
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Feb 3 11:44:47 2013 +0200

    escape messages wrt pango markup in admit-one error reporting

diff --git a/src/ui/mw/admit-one.cc b/src/ui/mw/admit-one.cc
index 60405ef..649fc80 100644
--- a/src/ui/mw/admit-one.cc
+++ b/src/ui/mw/admit-one.cc
@@ -119,14 +119,16 @@ dnd_maybe_admit_one( const char* fname)
 			cmd = g_strdup_printf( "mkdir -p '%s' && mv -n '%s' '%s'", dest_path, fname, dest);
 		else
 			cmd = g_strdup_printf( "mkdir -p '%s' && ln -s '%s' '%s'", dest_path, fname, dest);
+		char* cmde = g_markup_escape_text( cmd, -1);
 
 		int cmd_exit = system( cmd);
 		if ( cmd_exit )
 			pop_ok_message( wMainWindow,
 					"Failed to create recording path in experiment tree",
-					"Command\n %s\nexited with code %d", cmd_exit);
+					"Command\n <span font=\"monospace\">%s</span>\nexited with code %d", cmde, cmd_exit);
 
 		g_free( cmd);
+		g_free( cmde);
 		g_free( dest);
 		g_free( dest_path);
 	}

-- 
Sleep experiment manager