From 423799bfd79d3952485f79e856440760af35b0df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Thu, 29 Jan 2015 21:19:29 +0100
Subject: [PATCH] Integrate icons in addons

---
 chrome_addon/background.js  |   2 +-
 chrome_addon/gpass_icon.png | Bin 2125 -> 0 bytes
 chrome_addon/manifest.json  |   5 ++++-
 firefox_addon/lib/main.js   |   5 ++++-
 firefox_addon/package.json  |   4 +++-
 5 files changed, 12 insertions(+), 4 deletions(-)
 delete mode 100644 chrome_addon/gpass_icon.png

diff --git a/chrome_addon/background.js b/chrome_addon/background.js
index aff02cb..571dffe 100644
--- a/chrome_addon/background.js
+++ b/chrome_addon/background.js
@@ -7,7 +7,7 @@ chrome.runtime.onMessage.addListener(
 		type: "basic",
 		title : "gPass",
 		message : request.options.message,
-		iconUrl:chrome.extension.getURL("gpass_icon.png")
+		iconUrl:chrome.extension.getURL("gpass_icon_64.png")
 	    };
 
 	    chrome.notifications.create("gPass", options, function(){});
diff --git a/chrome_addon/gpass_icon.png b/chrome_addon/gpass_icon.png
deleted file mode 100644
index d78a7b3b8c5e443b1c60f6d99081ccd8a865d141..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2125
zcmV-T2(tHyP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vJvF88|qm@!J3Z02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00*^6L_t(|+U;9yP*m3$e$Kh~
zvI~o_EP_$0g83j0m>BD1(l(k}of-|1nU1Ob$k<Fe)9Fl`q^1+oX*&IpHd8ar#Kxp1
z9cfcdj7(_j#QM=z34#q}QY~$wpdeTg1SJxdkKMcX-gDmmV3!559|3nM7kOv)$Ntzk
z?|IJiKJW9Mdl#6AnV5+iIoKqxmohJprIu_+am-)HH3m4ZULlt|i|N_3ncm+I(bXl)
z|NKjsC#tOg06ze-I{<0--lr{H_kdcQmBp8)&tgSxH(TU%BG2JuEY-<in1nz85Ei6i
z&{dz0+P%Hh;`gKRQk!h}<uCjV0M6JA0B!Ah?WxCp;M{QYElPo=A$N8TN1Ef){a6C%
z=^+dZkZGFec<+RH_JwWwo~CnR-;}Sb+&O&Hp7M0BP9EWt9`e)me+Gqzx<1aLpKnY1
z06;;aa#a$%cV+XVDbMaHPv5cfbE-oCjIqSfjxiwB$*}5PZO-Svs6BD1O*CHouRJrQ
z0C;$_<Lgg9llIc0d=4v;0)ikQaIMEgMk=6yLymI|3&1V;9Cs{JH+<ABKRDYU&rKNs
zzWbQ-z}hvM+lnGKhYl&&`@1EmuPa7nWh$U{V^Kap<K%<{kdw<*O=Y(>H_821x}<NS
zIrBtq-jmH1+;OLpPf<{=t7SM`u@Nq9B{WuqRK6O2E-yuGtz%**$ADXJQ<kq<qb|Ol
zyb}h1Y2fanVg({nJAg#lE4QN{e;$a!5M^a7#L0img=vhx)k^?H#R__Q=>91IKt?9d
zb31ty*Fx|OW`k%nJetPg^`=77#JaHtprC*+nGyi>dF5rVE~8X4!|a<n!Jv-*O`nc}
zo4rugiJ3hHK!}K>n|uH=-R$Uz8f(lJgXIB^O%J!A<wD!2z9^Loxbw4JP!%?z&G+d*
z%XwKlB>-r@Bzxblv-au{&O-oLu>$zYxAvfSpb-FrkbV>`|09+b(}c}_O|^N=;Y7uh
z03evq^L4e>RTf3G3U5zAcJ|PBRRtC-P{-{9hWrH3&>-ZWDvYhaFAH3}o}AT00#N;~
z^&#iJAH7!Q+EuVnQN$=21f(Q@h0oiv#)rQGKm)_>eY$vkSKy)QDr^7s=A2Ll06^6-
z>-BZ3`?s8H7IG{T6a`?A2z5gGl<F@9U|Eo->Mir3ul2q8$TtQv60!M&GXMbAm1yk9
zLG$G$w|US0;hprCR@|o*W@IuB0GtD00sw&skdnm|xt<;hbal$M(;tfVg9nVNxAz&l
z0kkDD--H8j<e(Yi_|c7}1FPSvNG~thkg`%s8Dc=V1XxT4FaW1cS`81b?f*7_`eaS6
z9LbGNzaJMYLBSGWU=SlpAo}tI!0BW@0PV?4FxddWG)a;SYXF!WzU3l{I|8do7}+Nm
z0Lz3G+9+3sT){8{B#$`<G7cr#IVPV07AzX>0t_s~0E*uQ7=t=1D4=#O0W)Ov6dq>4
zkS}2I?5^UrI{-q!9P0yyg^n0v-Fh<yHN*Z4fHAz7!T=r;K^DIRIMi9Qrb7t?k9lb5
z3p>GhMo0>1UN7060Vah201G<7_*U54M^wJoc&qV@IB#zN3=A`XBQy(yx&V)O@}>#w
z_?3S6H#_xblAT}D0Wb_Qg41wN2P8swA{3znIDiYS65C(U-@qh9@&O2h84v;>JRY-%
zmnVgV9LK6Ne!ad#d&Kqt1avtH0ELU;fhd{=5P-YxQnDX^()m<QF3Yzy0Dk?G3}B&Y
zFh&=!EWq!>`R=RKZEFC0zR>_E!4imPg$I3v<|c6#z@W_mpwSE%Q3A1^2atr>*(qCX
zuK|OD(g*{<peW%dfw87RO91t!tTj$2`vQ{q9z)Ur80ZU^00H2^t5S+{A22(cX;qb(
z8+VquDxdyIs$yFJdcE{X4T#ePLI7DHbY7N!t$WXswguqhYh*<30)Uh}<}A?MDlpJ5
z->9xKrHwU!Owd>#0DxHBarmQd>S#DEPup4qfiXT{#DmaiK0pbIU`K~+cxS)Snat$W
z$p%2-0xU?0NE)C3sI9YbzDXRYIc~iSz-xN|Xp|3-!%c0h4^RR8?U;p{<HqvmpVQ9)
z7_hw$0ALzM*awUphQ^iv0mz-haH86hld<{90>Cf=VYyQj0T!hV3INNNsQBU5)PH{e
z3C9)y?rFh*fIhMfQg{}K&;|_<N*~metv^nCamTB!H|OW`9Qy-cggqZ)<_I4^QB^ZH
zm*Jb6Qy%#0CdbyB=5lW95(or_01yDav_?Vum3lB9Kw<Gk$S5fgfV4D*^mLZ@nfcuQ
zB@og82Q;iJ{WrRLYOr>d67h}F5CWA)&5r8h#?MZ^pFAr(8Ew!q&9DXp0DO5p!@@-^
zu%ax_0W`Nr^Of!TmgALHqun*Y*W4sX8!^!`1}t8zBHAmp{R4#WJUZ~)Uyhg+m?n|8
zbC;{tCq1OccqLvZ5B2I<R8pF<8`Cf{x4oElpyOH=1)^-eyFZJ5`fS>MOyh7p{-kqz
zYloYx2!Dup?YFKPFyvsm$Fk+h_fDP8BoW-aMIPE)k$xG#JlrTTXD%;!_wO0~KIx%D
zM>D(t3UQ;w-S?;~%67XBdpztO+`!?)Ow7bg{J-LVb~4s|9m$*800000NkvXXu0mjf
Dp$XKG

diff --git a/chrome_addon/manifest.json b/chrome_addon/manifest.json
index 62e78de..033b728 100644
--- a/chrome_addon/manifest.json
+++ b/chrome_addon/manifest.json
@@ -4,7 +4,10 @@
     "name": "gpass",
     "version": "0.6",
     "description": "gPass : global password manager",
-
+    "icons" : {"16":"gpass_icon_16.png", "32":"gpass_icon_32.png", "64":"gpass_icon_64.png", "128":"gpass_icon_128.png"},
+    "author" : "Grégory Soutadé",
+    "homepage_url" : "http://indefero.soutade.fr/p/gpass",
+    
     "content_scripts": [
 	{
 	    "matches": ["https://*/*", "http://*/*"],
diff --git a/firefox_addon/lib/main.js b/firefox_addon/lib/main.js
index c7a77f3..c757a97 100644
--- a/firefox_addon/lib/main.js
+++ b/firefox_addon/lib/main.js
@@ -19,11 +19,12 @@
 
 var {Cc, Ci} = require("chrome");
 var notifications = require("sdk/notifications");
+var self = require("sdk/self");
+var prefSet = require("sdk/simple-prefs");
 
 var pkdbf2 = require("pkdbf2").pkdbf2;
 var aes = require("jsaes").aes;
 var parseURI = require("parseuri").parseURI;
-var prefSet = require("sdk/simple-prefs");
 var DEBUG = false;
 var pkdbf2_level = getPref("pkdbf2_level");
 var protocol_version = 3;
@@ -56,10 +57,12 @@ function debug(s)
 
 function notify(text, data)
 {
+    var icon = self.data.url("gpass_icon_64.png");
     notifications.notify({
 	title: "gPass",
 	text: text,
 	data: data,
+	iconUrl: icon,
     });
 }
 
diff --git a/firefox_addon/package.json b/firefox_addon/package.json
index f225eb8..c6d57b8 100644
--- a/firefox_addon/package.json
+++ b/firefox_addon/package.json
@@ -5,7 +5,9 @@
   "description": "gPass : global password manager",
   "author": "Grégory Soutadé",
   "license": "GNU GPL v3",
-  "version": "0.6",
+    "homepage" : "http://indefero.soutade.fr/p/gpass",
+    "icon" : "data/gpass_icon_64.png",
+    "version": "0.6",
     "preferences": [
     {
         "name": "account_url",