From a422ef6a6da4218abea237fd8d607ed2c310163f Mon Sep 17 00:00:00 2001
From: Nuno Cruces <ncruces@users.noreply.github.com>
Date: Thu, 4 Mar 2021 13:06:49 +0000
Subject: [PATCH] Empty icons, fixes.

---
 cmd/zenity/main.go |  2 ++
 msg_unix.go        |  2 ++
 notify_unix.go     | 10 ++++++----
 notify_windows.go  |  2 +-
 zenity.go          |  1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cmd/zenity/main.go b/cmd/zenity/main.go
index 395e5b3..5cf25e5 100644
--- a/cmd/zenity/main.go
+++ b/cmd/zenity/main.go
@@ -245,6 +245,8 @@ func loadFlags() []zenity.Option {
 
 	var ico zenity.DialogIcon
 	switch icon {
+	case "":
+		ico = zenity.NoIcon
 	case "error", "dialog-error":
 		ico = zenity.ErrorIcon
 	case "info", "dialog-information":
diff --git a/msg_unix.go b/msg_unix.go
index 3d432e5..79d0c78 100644
--- a/msg_unix.go
+++ b/msg_unix.go
@@ -52,6 +52,8 @@ func message(kind messageKind, text string, opts options) (bool, error) {
 		args = append(args, "--default-cancel")
 	}
 	switch opts.icon {
+	case NoIcon:
+		args = append(args, "--icon-name=")
 	case ErrorIcon:
 		args = append(args, "--window-icon=error", "--icon-name=dialog-error")
 	case WarningIcon:
diff --git a/notify_unix.go b/notify_unix.go
index b65bcc7..9630f8e 100644
--- a/notify_unix.go
+++ b/notify_unix.go
@@ -16,14 +16,16 @@ func notify(text string, opts options) error {
 		args = append(args, "--title", *opts.title)
 	}
 	switch opts.icon {
+	case NoIcon:
+		args = append(args, "--window-icon=dialog")
 	case ErrorIcon:
-		args = append(args, "--window-icon=error")
+		args = append(args, "--window-icon=dialog-error")
 	case WarningIcon:
-		args = append(args, "--window-icon=warning")
+		args = append(args, "--window-icon=dialog-warning")
 	case InfoIcon:
-		args = append(args, "--window-icon=info")
+		args = append(args, "--window-icon=dialog-information")
 	case QuestionIcon:
-		args = append(args, "--window-icon=question")
+		args = append(args, "--window-icon=dialog-question")
 	}
 
 	_, err := zenutil.Run(opts.ctx, args)
diff --git a/notify_windows.go b/notify_windows.go
index fbf8460..d3f4afc 100644
--- a/notify_windows.go
+++ b/notify_windows.go
@@ -33,7 +33,7 @@ func notify(text string, opts options) error {
 	}
 
 	switch opts.icon {
-	case InfoIcon:
+	case InfoIcon, QuestionIcon:
 		args.InfoFlags |= 0x1 // NIIF_INFO
 	case WarningIcon:
 		args.InfoFlags |= 0x2 // NIIF_WARNING
diff --git a/zenity.go b/zenity.go
index 7eaa654..fce49cc 100644
--- a/zenity.go
+++ b/zenity.go
@@ -97,6 +97,7 @@ const (
 	WarningIcon
 	InfoIcon
 	QuestionIcon
+	NoIcon
 )
 
 // Icon returns an Option to set the dialog icon.