Branch: refs/heads/master
Author: Nick Treleaven <nick.treleaven(a)btinternet.com>
Committer: Nick Treleaven <nick.treleaven(a)btinternet.com>
Date: Mon, 09 Jul 2012 12:31:04
Commit: 8d26450f07cac40812a04fe2adfd29fa54f25059
https://github.com/geany/geany/commit/8d26450f07cac40812a04fe2adfd29fa54f25…
Log Message:
-----------
Add status bar warning if Windows spawn timed out
Modified Paths:
--------------
src/win32.c
Modified: src/win32.c
9 files changed, 7 insertions(+), 2 deletions(-)
===================================================================
@@ -1093,10 +1093,15 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline
else
{
gint i;
+ gsize ms = 30*1000;
- for (i = 0; i < 2 && WaitForSingleObject(piProcInfo.hProcess, 30*1000) == WAIT_TIMEOUT; i++)
+ /* FIXME: this seems to timeout when there are many lines
+ * to read - maybe because the child's pipe is full */
+ for (i = 0; i < 2 &&
+ WaitForSingleObject(piProcInfo.hProcess, ms) == WAIT_TIMEOUT; i++)
{
- geany_debug("CreateChildProcess: CreateProcess failed");
+ ui_set_statusbar(FALSE, _("Process timed out after %.02f s!"), ms / 1000.0F);
+ geany_debug("CreateChildProcess: timed out");
TerminateProcess(piProcInfo.hProcess, WAIT_TIMEOUT); /* NOTE: This will not kill grandkids. */
}
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sun, 08 Jul 2012 23:07:52
Commit: deb5f3542b5b618e56ca9d823f40df062188eb6a
https://github.com/geany/geany/commit/deb5f3542b5b618e56ca9d823f40df062188e…
Log Message:
-----------
Bump API version to reflect Scintilla's SCI_{GET,SET}USEPALETTE removal
Scintilla deprecated SCI_GETUSEPALETTE and SCI_SETUSEPALETTE messages,
and since we don't build with deprecated API support they aren't
available anymore.
Modified Paths:
--------------
src/plugindata.h
Modified: src/plugindata.h
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -55,7 +55,7 @@
* @warning You should not test for values below 200 as previously
* @c GEANY_API_VERSION was defined as an enum value, not a macro.
*/
-#define GEANY_API_VERSION 215
+#define GEANY_API_VERSION 216
/** The Application Binary Interface (ABI) version, incremented whenever
* existing fields in the plugin data types have to be changed or reordered.
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: Nick Treleaven <nick.treleaven(a)btinternet.com>
Committer: Nick Treleaven <nick.treleaven(a)btinternet.com>
Date: Fri, 06 Jul 2012 12:17:54
Commit: 5af4dab5f06316395d1507455284d7f8c588f9e2
https://github.com/geany/geany/commit/5af4dab5f06316395d1507455284d7f8c588f…
Log Message:
-----------
Fix showing project name in sidebar documents
This was broken if the base path ended with a directory separator.
Modified Paths:
--------------
src/sidebar.c
Modified: src/sidebar.c
3 files changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -368,8 +368,9 @@ static gchar *get_doc_folder(const gchar *path)
{
gsize len = strlen(project_base_path);
+ /* remove trailing separator so we can match base path exactly */
if (project_base_path[len-1] == G_DIR_SEPARATOR)
- project_base_path[len-1] = '\0';
+ project_base_path[--len] = '\0';
/* check whether the dir name matches or uses the project base path */
if (utils_filename_has_prefix(tmp_dirname, project_base_path))
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).