From 978a94de723f5a7f200dc72c7c7bfceef50d0503 Mon Sep 17 00:00:00 2001
From: rhysd <lin90162@yahoo.co.jp>
Date: Tue, 8 Sep 2015 18:57:31 +0900
Subject: [PATCH] Fix parameter's type of Tray.setImage()

`Tray.setImage()` can take `string` parameter the same as constructor of
`Tray`.
---
 github-electron/github-electron-main-tests.ts | 1 +
 github-electron/github-electron.d.ts          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts
index a849295b67..6ec16a5d39 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/github-electron/github-electron-main-tests.ts
@@ -409,6 +409,7 @@ app.on('ready', () => {
 	]);
 	appIcon.setToolTip('This is my application.');
 	appIcon.setContextMenu(contextMenu);
+	appIcon.setImage('/path/to/new/icon');
 });
 
 // clipboard
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
index fb09805202..cc300b73f2 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -1212,7 +1212,7 @@ declare module GitHubElectron {
 		/**
 		 * Sets the image associated with this tray icon.
 		 */
-		setImage(image: NativeImage): void;
+		setImage(image: NativeImage|string): void;
 		/**
 		 * Sets the image associated with this tray icon when pressed.
 		 */