Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 06 Mar 2016 15:14:46 UTC
Commit: 52f5b88873c44486157cfb6127598e92f909172e
https://github.com/geany/geany/commit/52f5b88873c44486157cfb6127598e92f9091…
Log Message:
-----------
Windows Installer: declare files to be reserved for faster startup
This tells NSIS to place the necessary libraries at the beginning
of the packed installer so the installer does not need to extract
everything before it can start.
Modified Paths:
--------------
geany.nsi.in
Modified: geany.nsi.in
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -77,6 +77,12 @@ Var UNINSTDIR
;;;;;;;;;;;;;;;;
!include "MUI2.nsh"
+;Reserve files used in .onInit, for faster start-up
+ReserveFile "${NSISDIR}\Plugins\System.dll"
+ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
+ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
+ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
+
!define MUI_ABORTWARNING
!define MUI_ICON "icons\geany.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall-full.ico"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 06 Mar 2016 10:16:52 UTC
Commit: 2f5eca2cfd0def376e7430f8f71ce9401cf2c0e1
https://github.com/geany/geany/commit/2f5eca2cfd0def376e7430f8f71ce9401cf2c…
Log Message:
-----------
Add error reporting for opening URIs on Windows
Before it silently failed if there was any error. Now at least a
console warning is logged.
Modified Paths:
--------------
src/win32.c
Modified: src/win32.c
10 lines changed, 9 insertions(+), 1 deletions(-)
===================================================================
@@ -785,6 +785,7 @@ gint win32_check_write_permission(const gchar *dir)
/* Just a simple wrapper function to open a browser window */
void win32_open_browser(const gchar *uri)
{
+ gint ret;
if (strncmp(uri, "file://", 7) == 0)
{
uri += 7;
@@ -794,7 +795,14 @@ void win32_open_browser(const gchar *uri)
uri++;
}
}
- ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL);
+ ret = (gint) ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL);
+ if (ret <= 32)
+ {
+ gchar *err = g_win32_error_message(GetLastError());
+ /* TODO add a GUI warning that opening an URI failed */
+ g_warning("ShellExecute failed opening \"%s\" (code %d): %s", uri, ret, err);
+ g_free(err);
+ }
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).