SF.net SVN: geany:[3257] trunk

[eht16 at users.sourceforge.net]

Revision: 3257
          http://geany.svn.sourceforge.net/geany/?rev=3257&view=rev
Author:   eht16
Date:     2008-11-19 18:41:37 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
Fix broken LaTeX view commands (closes #2315014).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/build.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-19 18:04:16 UTC (rev 3256)
+++ trunk/ChangeLog	2008-11-19 18:41:37 UTC (rev 3257)
@@ -8,6 +8,8 @@
  * geany.nsi:
    Properly support silent installations with the Windows installer
    (closes #2204671).
+ * src/build.c:
+   Fix broken LaTeX view commands (closes #2315014).
 
 
 2008-11-18  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2008-11-19 18:04:16 UTC (rev 3256)
+++ trunk/src/build.c	2008-11-19 18:41:37 UTC (rev 3257)
@@ -232,7 +232,7 @@
 		g_strfreev(term_argv);
 		return (GPid) 1;
 	}
-	g_free(working_dir);
+	g_free(script_name);
 
 	argv = g_new0(gchar *, term_argv_len + 3);
 	for (i = 0; i < term_argv_len; i++)
@@ -244,28 +244,27 @@
 		if (strstr(argv[0], "cmd.exe") != NULL)
 		{
 			argv[term_argv_len   ]  = g_strdup("/Q /C");
-			argv[term_argv_len + 1] = script_name;
+			argv[term_argv_len + 1] = g_strconcat("/bin/sh ", RUN_SCRIPT_CMD, NULL);
 		}
 		else
 		{
-			argv[term_argv_len    ] = script_name;
+			argv[term_argv_len    ] = g_strconcat("/bin/sh ", RUN_SCRIPT_CMD, NULL);
 			argv[term_argv_len + 1] = NULL;
 		}
 #else
 	argv[term_argv_len   ]  = g_strdup("-e");
-	argv[term_argv_len + 1] = script_name;
+	argv[term_argv_len + 1] = g_strconcat("/bin/sh ", RUN_SCRIPT_CMD, NULL);
 #endif
 	argv[term_argv_len + 2] = NULL;
 
-
-	if (! g_spawn_async(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
+	if (! g_spawn_async(working_dir, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
 						NULL, NULL, &(run_info.pid), &error))
 	{
 		geany_debug("g_spawn_async() failed: %s", error->message);
 		ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message);
 
-		utils_free_pointers(6, executable, view_file, locale_filename, cmd_string, locale_cmd_string,
-										locale_term_cmd, NULL);
+		utils_free_pointers(7, executable, view_file, locale_filename, cmd_string,
+			locale_cmd_string, locale_term_cmd, working_dir, NULL);
 		g_strfreev(argv);
 		g_strfreev(term_argv);
 		g_error_free(error);
@@ -280,8 +279,8 @@
 		build_menu_update(doc);
 	}
 
-	utils_free_pointers(6, executable, view_file, locale_filename, cmd_string, locale_cmd_string,
-										locale_term_cmd, NULL);
+	utils_free_pointers(7, executable, view_file, locale_filename, cmd_string,
+		locale_cmd_string, locale_term_cmd, working_dir, NULL);
 	g_strfreev(argv);
 	g_strfreev(term_argv);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.