Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cgo_windows.go #1

Merged
merged 1 commit into from
Aug 3, 2016
Merged

Update cgo_windows.go #1

merged 1 commit into from
Aug 3, 2016

Conversation

emersion
Copy link

@emersion emersion commented Aug 3, 2016

Remove log

@thomasf
Copy link
Owner

thomasf commented Aug 3, 2016

makes sense, thanks.

@thomasf thomasf merged commit 99abd6e into thomasf:master Aug 3, 2016
@thomasf
Copy link
Owner

thomasf commented Aug 3, 2016

I'm not sure which code I actually ended up using or if I have made additional changes to this version of the code https://github.com/alkasir/alkasir/tree/master/pkg/client/ui/systray

Don't remember if these are imporitant changes or not but I should merge the other repo into here and vendor it instead...

diff /home/thomasf/src/github.com/alkasir/alkasir/pkg/client/ui/systray/cgo_windows.go ./cgo_windows.go
12d11
<   "log"
28c27
<       log.Printf("Unable to create temp icon: %v", err)
---
>       log.Errorf("Unable to create temp icon: %v", err)
34c33
<       log.Printf("Unable to write icon to temp file %v: %v", f.Name(), f)
---
>       log.Errorf("Unable to write icon to temp file %v: %v", f.Name(), f)
41c40
<       log.Printf("Unable to convert name to string pointer: %v", err)
---
>       log.Errorf("Unable to convert name to string pointer: %v", err)
101d99
<   log.Println("systray reay")
Only in .: example
Only in .: .git
diff /home/thomasf/src/github.com/alkasir/alkasir/pkg/client/ui/systray/systray_darwin.m ./systray_darwin.m
110d109
<   // [NSApp terminate:self]; // this exits the whole application, which we don't want.
diff /home/thomasf/src/github.com/alkasir/alkasir/pkg/client/ui/systray/systray.go ./systray.go
11a12,13
> 
>   "github.com/getlantern/golog"
32a35,36
>   log = golog.LoggerFor("systray")
> 
diff /home/thomasf/src/github.com/alkasir/alkasir/pkg/client/ui/systray/systray_linux.c ./systray_linux.c
37c37
<     return 0;
---
>   return;
125,126c125
<     app_indicator_set_status(global_app_indicator, APP_INDICATOR_STATUS_PASSIVE);
<     gtk_main_quit();
---
>   app_indicator_set_status(global_app_indicator, APP_INDICATOR_STATUS_PASSIVE);
diff /home/thomasf/src/github.com/alkasir/alkasir/pkg/client/ui/systray/systray_windows.c ./systray_windows.c
10d9
< #define WM_DONE (WM_USER + 2)
155,157d153
<         if (msg.message == WM_DONE) {
<           return EXIT_SUCCESS;
<         };
217d212
<     PostMessage (hWnd, WM_DONE, 0,  0);

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants