From ae5c74b6cd55e90521b4b71762b15c27f2ada836 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Thu, 19 Nov 2020 07:02:29 +1100 Subject: [PATCH] ResolveAlias -> ResolvesAlias --- v2/internal/ffenestri/ffenestri.h | 2 +- v2/internal/ffenestri/ffenestri_client.go | 2 +- v2/internal/ffenestri/ffenestri_darwin.c | 4 ++-- v2/internal/messagedispatcher/message/dialog.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/v2/internal/ffenestri/ffenestri.h b/v2/internal/ffenestri/ffenestri.h index cc16a8d88..ab0978595 100644 --- a/v2/internal/ffenestri/ffenestri.h +++ b/v2/internal/ffenestri/ffenestri.h @@ -29,7 +29,7 @@ extern void Fullscreen(void *app); extern void UnFullscreen(void *app); extern void ToggleFullscreen(void *app); extern void DisableFrame(void *app); -extern void OpenDialog(void *appPointer, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolveAliases, int treatPackagesAsDirectories); +extern void OpenDialog(void *appPointer, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories); extern void SaveDialog(void *appPointer, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories); extern void DarkModeEnabled(void *appPointer, char *callbackID); #endif diff --git a/v2/internal/ffenestri/ffenestri_client.go b/v2/internal/ffenestri/ffenestri_client.go index 40acde18c..d9ca073f2 100644 --- a/v2/internal/ffenestri/ffenestri_client.go +++ b/v2/internal/ffenestri/ffenestri_client.go @@ -132,7 +132,7 @@ func (c *Client) OpenDialog(dialogOptions *options.OpenDialog, callbackID string c.app.bool2Cint(dialogOptions.AllowMultiple), c.app.bool2Cint(dialogOptions.ShowHiddenFiles), c.app.bool2Cint(dialogOptions.CanCreateDirectories), - c.app.bool2Cint(dialogOptions.ResolveAliases), + c.app.bool2Cint(dialogOptions.ResolvesAliases), c.app.bool2Cint(dialogOptions.TreatPackagesAsDirectories), ) } diff --git a/v2/internal/ffenestri/ffenestri_darwin.c b/v2/internal/ffenestri/ffenestri_darwin.c index 6f243894d..af322b5b6 100644 --- a/v2/internal/ffenestri/ffenestri_darwin.c +++ b/v2/internal/ffenestri/ffenestri_darwin.c @@ -535,7 +535,7 @@ void SetPosition(struct Application *app, int x, int y) { } // OpenDialog opens a dialog to select files/directories -void OpenDialog(struct Application *app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolveAliases, int treatPackagesAsDirectories) { +void OpenDialog(struct Application *app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories) { Debug(app, "OpenDialog Called with callback id: %s", callbackID); // Create an open panel @@ -573,7 +573,7 @@ void OpenDialog(struct Application *app, char *callbackID, char *title, char *fi msg(dialog, s("setAllowsMultipleSelection:"), allowMultiple); msg(dialog, s("setShowsHiddenFiles:"), showHiddenFiles); msg(dialog, s("setCanCreateDirectories:"), canCreateDirectories); - msg(dialog, s("setResolvesAliases:"), resolveAliases); + msg(dialog, s("setResolvesAliases:"), resolvesAliases); msg(dialog, s("setTreatsFilePackagesAsDirectories:"), treatPackagesAsDirectories); // Setup callback handler diff --git a/v2/internal/messagedispatcher/message/dialog.go b/v2/internal/messagedispatcher/message/dialog.go index 44caf5652..9b71c0fed 100644 --- a/v2/internal/messagedispatcher/message/dialog.go +++ b/v2/internal/messagedispatcher/message/dialog.go @@ -25,7 +25,7 @@ func dialogMessageParser(message string) (*parsedMessage, error) { message = message[2:] idx := strings.IndexByte(message, '|') if idx < 0 { - return nil, fmt.Errorf("Invalid dialog response message format") + return nil, fmt.Errorf("Invalid dialog response message format: %+v", message) } callbackID := message[:idx+1] payloadData := message[idx+1:]