From 077e652b62e1396bf4b9323d69887a53f0d6d2e7 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 18 Aug 2011 02:56:21 +0000
Subject: [PATCH] Added an icon for the Nokia N900 plug-in

---
 Makefile                         |   4 ++++
 src/plugins/16x16/Makefile       |   3 +++
 src/plugins/16x16/phone-n900.png | Bin 0 -> 472 bytes
 src/plugins/16x16/project.conf   |   5 ++++-
 src/plugins/24x24/Makefile       |   3 +++
 src/plugins/24x24/phone-n900.png | Bin 0 -> 644 bytes
 src/plugins/24x24/project.conf   |   5 ++++-
 src/plugins/32x32/Makefile       |   3 +++
 src/plugins/32x32/phone-n900.png | Bin 0 -> 794 bytes
 src/plugins/32x32/project.conf   |   5 ++++-
 src/plugins/48x48/Makefile       |   3 +++
 src/plugins/48x48/phone-n900.png | Bin 0 -> 1085 bytes
 src/plugins/48x48/project.conf   |   5 ++++-
 src/plugins/n900.c               |   4 +++-
 14 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 src/plugins/16x16/phone-n900.png
 create mode 100644 src/plugins/24x24/phone-n900.png
 create mode 100644 src/plugins/32x32/phone-n900.png
 create mode 100644 src/plugins/48x48/phone-n900.png

diff --git a/Makefile b/Makefile
index 148b41c..a811767 100644
--- a/Makefile
+++ b/Makefile
@@ -109,15 +109,19 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/plugins/Makefile \
 		$(PACKAGE)-$(VERSION)/src/plugins/project.conf \
 		$(PACKAGE)-$(VERSION)/src/plugins/16x16/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/16x16/phone-n900.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/16x16/phone-openmoko.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/16x16/project.conf \
 		$(PACKAGE)-$(VERSION)/src/plugins/24x24/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/24x24/phone-n900.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/24x24/phone-openmoko.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/24x24/project.conf \
 		$(PACKAGE)-$(VERSION)/src/plugins/32x32/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/32x32/phone-n900.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/32x32/phone-openmoko.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/32x32/project.conf \
 		$(PACKAGE)-$(VERSION)/src/plugins/48x48/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/48x48/phone-n900.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/48x48/phone-openmoko.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/48x48/project.conf \
 		$(PACKAGE)-$(VERSION)/tools/engineering.c \
diff --git a/src/plugins/16x16/Makefile b/src/plugins/16x16/Makefile
index 725cfaa..2c05e9c 100644
--- a/src/plugins/16x16/Makefile
+++ b/src/plugins/16x16/Makefile
@@ -12,10 +12,13 @@ clean:
 distclean: clean
 
 install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
+	$(INSTALL) -m 0644 -- phone-n900.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-n900.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
 	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-openmoko.png
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-n900.png
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-openmoko.png
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/plugins/16x16/phone-n900.png b/src/plugins/16x16/phone-n900.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b49d283b37e024ddcc2492c60524bc0c7b08ee2
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf0004NNkl<ZILpP8
zJB|}U5Qe|5?rBS_G16k$vQ0wd2#Hg05iS8o;AUhSO+;W>Bg>4iY#!T!nd$Bt5<IXG
z-e^lIRaAd{^@68113Yuiy*I`@e@x;q4Cj>62PYzLXS3P6^?EHYU%z4QzcHWB+4p<W
zF`=EJs^px<Sl2a&!yzA!$1hGqO7Fdh2%kTF<Xi~5-Hyr4ghC2bl^7#k*U|SqUDqKZ
zc<-%<lnx;0OiGES*|OPeSglrg@3GbbkW!-Wd$!vxbzQSqEXX+n;8g!2#u!H*h5-@b
z-vTj4a?WErs>%Zb0Pj81=@e@%#uxxX2%JtQLI@+#NC2R!48s6GRaI0~g>&u!!6o6(
z22j;e;78lGgb*mp@~Rbv5NO*L;JX2CilW#rm&@A=#ea{-7@DT}8e@FnfS=ad0NnO{
zf0e*wGQnCKVvN5oGq}$=x6V0pjX=(MP}Td(DFZBlSC4#yJK+4}&&Y3Z7T{cx;#v9t
O0000<MNUMnLSTZCFv|u2

literal 0
HcmV?d00001

diff --git a/src/plugins/16x16/project.conf b/src/plugins/16x16/project.conf
index 799af87..da30c84 100644
--- a/src/plugins/16x16/project.conf
+++ b/src/plugins/16x16/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,phone-openmoko.png
+dist=Makefile,phone-n900.png,phone-openmoko.png
+
+[phone-n900.png]
+install=$(PREFIX)/share/icons/hicolor/16x16/apps
 
 [phone-openmoko.png]
 install=$(PREFIX)/share/icons/hicolor/16x16/apps
diff --git a/src/plugins/24x24/Makefile b/src/plugins/24x24/Makefile
index 34fe8eb..7ec3b01 100644
--- a/src/plugins/24x24/Makefile
+++ b/src/plugins/24x24/Makefile
@@ -12,10 +12,13 @@ clean:
 distclean: clean
 
 install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
+	$(INSTALL) -m 0644 -- phone-n900.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-n900.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
 	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-openmoko.png
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-n900.png
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-openmoko.png
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/plugins/24x24/phone-n900.png b/src/plugins/24x24/phone-n900.png
new file mode 100644
index 0000000000000000000000000000000000000000..d28df06758cacf7be34be1fdbf00ac7b4afbbf3d
GIT binary patch
literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf0006PNkl<ZNXPA!
zPiqrF7{-6|$8E%9agkKKiXzFuquMXv(GTF!i=WAhA4EiYDp)Y59;AgDy$H6DkWBMu
zc4x*zGQ%cmQQLx-KCsLzv->>n^S<-WzzzNYu^gMg^V<7W5rEHt5kMw{_$H;iC#Cdx
zo(rYarC6PFj7Fp2y_eqmlMuo~4Lkzwce`B$@Z{MmZnp~Vy6<#49RPY?do*7(F`o<}
zghhxUY|M=@93CD5aBy(&0C=pIX$jtY00uw4FxIy?rJ~>Oqm)8x&Dn=D!fZk0y~jD1
zo~o+SJn}5lBy`;#!0E4_42MIuwzkN!ER9-glv0EcaL!SdCDvNz^EuX9X0sVZQ6!#-
zC?MiOjAVOzo1L8<lu{_AkWwPVVh?!llZ&dV*xlV_GMOat`UXl4YSvcl*Vm<#Dc@1R
zd!JIY&a)yAKZsFGCKHCkVR9gZNDkKPFrUwp@I@)wP>%K^SxiwRIzB$;=;&xA`oD4z
zF&GTk+uK73u~CB%0@LXfYi-)97x8R3h(DBNNm-VwZC?{Ow|$px*9A^P2*MZxK%VCm
zMRDm)jyxd*0i49M=bhI2O{>+?*KrVy$K$H1s`tR#NVwl<G+wvc?dE7Sx)OPw=agkR
zGsf(%)BwO*yOG0xg|+tFA{%S1%(4tA<&^}q)>vyLVCwh59i`Mq@BP#3sDYHS=bU>9
eOmD8-|Bv6g8i7+7=(*ki0000<MNUMnLSTYk*(*i>

literal 0
HcmV?d00001

diff --git a/src/plugins/24x24/project.conf b/src/plugins/24x24/project.conf
index 87c7e4e..038befe 100644
--- a/src/plugins/24x24/project.conf
+++ b/src/plugins/24x24/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,phone-openmoko.png
+dist=Makefile,phone-n900.png,phone-openmoko.png
+
+[phone-n900.png]
+install=$(PREFIX)/share/icons/hicolor/24x24/apps
 
 [phone-openmoko.png]
 install=$(PREFIX)/share/icons/hicolor/24x24/apps
diff --git a/src/plugins/32x32/Makefile b/src/plugins/32x32/Makefile
index fa53749..477838a 100644
--- a/src/plugins/32x32/Makefile
+++ b/src/plugins/32x32/Makefile
@@ -12,10 +12,13 @@ clean:
 distclean: clean
 
 install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
+	$(INSTALL) -m 0644 -- phone-n900.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-n900.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
 	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-openmoko.png
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-n900.png
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-openmoko.png
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/plugins/32x32/phone-n900.png b/src/plugins/32x32/phone-n900.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2a854687f02a73b99d4557eeb84afa598b5f704
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00085Nkl<ZSi|j?
zO=}ZD7{`Azlf+85hqOW3ODX705qk5WP>_C+UOf3h`~Xtusb{HPJP7T{lZRef4=I8Y
z5(N=jHYQD*ot+mi*=6!-#HRGnKMcFsWS{xZ?|Jr_4czKhH$=~b5Dmaz$LP)V6hQP0
z9G6O^M@vgf5};D4P%f8|QUV}^KnQ`9GCv29QsTXzYQ%BO>FFr|XJ=<lYyBBmFZ3q3
z7e$e*R4M?htgKLZ{))Rl-=i*mu(`RJqdGV^VDaT5tv4;qFEcgbTCJ9!CrKjXI9~SN
zQ^+oQ?{UrnV2mL-eoc}zky5a?x7SBO?`Z6Ai|7H&R_UA@do;%6@xAxCnUMxAFE9D>
z@dL$Tky5Edu~_UIh3^HFQh5rp35+qMY1%im)}(35+S=Om1_s?b=djl1H2~n8>#G4{
z4Axq#wfQ~a7>qw;APX8Iwbl|v5nEeZNGWpzVKHXG1`TVi+1}pHuZIRgO(fu)BS{iY
zPEJrt<=8_KgEf#5&|2p)M#Z0KAd|Hgtu@tZ6{Qq~LZQz<W+F^kmWu2c#vE&45K;I;
zr4$<*8$<ZB{t(_D#!1tZ-QC^3$p=$BF$E!oX0ti8@<9ULdkzl|X*3!+flyNwVfaNR
ztu_1m`+4UZmjdrSolb`|O-B~nxcGl1;GCn?YUQ6N5g0e|KNFBrGB-DOrMq3$GsY39
zce~x?Fz*Ws3s-8O(P(gfehxsl+XbkFyWu+UNhx(lDK*o5zt=4j;0bUfg4}*Bm&^B8
zS6AtDIwNuYkAx6JQAE97CywK9-unkbH2~0Vw`sTAGg<wpB9+(q+BNYp1iHo;qA2R?
z^H-_)`T6Xv=wehKc-LyR9#*SWBZTlXA|TQ<EdX!x+8Chm0(d;*OdJ6_fW7@MaH|`k
YKNF0IcNfIL`~Uy|07*qoM6N<$f_3Cz-2eap

literal 0
HcmV?d00001

diff --git a/src/plugins/32x32/project.conf b/src/plugins/32x32/project.conf
index dd39c6c..260384b 100644
--- a/src/plugins/32x32/project.conf
+++ b/src/plugins/32x32/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,phone-openmoko.png
+dist=Makefile,phone-n900.png,phone-openmoko.png
+
+[phone-n900.png]
+install=$(PREFIX)/share/icons/hicolor/32x32/apps
 
 [phone-openmoko.png]
 install=$(PREFIX)/share/icons/hicolor/32x32/apps
diff --git a/src/plugins/48x48/Makefile b/src/plugins/48x48/Makefile
index 36309aa..74a1cf2 100644
--- a/src/plugins/48x48/Makefile
+++ b/src/plugins/48x48/Makefile
@@ -12,10 +12,13 @@ clean:
 distclean: clean
 
 install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
+	$(INSTALL) -m 0644 -- phone-n900.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-n900.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
 	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-openmoko.png
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-n900.png
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-openmoko.png
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/plugins/48x48/phone-n900.png b/src/plugins/48x48/phone-n900.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2455ffa28b334aff5ea6f1709439cb8cba11bfd
GIT binary patch
literal 1085
zcmV-D1j74?P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf000BfNkl<ZXx{Ca
z&r9@17{@<J)_s$uC|h6fSf#9Ok-E@=-riHs{sl$67fKJk_STav^wy)Oc;0J8=%EUp
zY++wsDdpWm(RzB>tZvbbYclEKb@EPTGi!WTy1tMv44EgBOuo<0nVp3K1qu`>Faj)1
z{sMRglpiVIKJXjxYu4aTK>UuhA9W9W4Ezb;c^;)wDbZ?jauUz;#$xVXuSd7rP2?~P
z>GgWtD)ABUQZoG%z;PUEwOVSDTCK*D_dkSE1^eIDYppE{%d!Ug_JoaB_Xu7DaPwx4
zIF6I6+RwVD_Jbgx)oP{q93LMOMUe&6RRwHGMou6hgn-(Y2zQ3}UVH~Yy<VqYucw~d
z-rlA>U*_poPw{{D37Wyk9=N)?8sH<11vmgD{UsqpN{-{0%HLaHzsc)nvq`hr9L%tn
zeO`V4itsFakPwRFcz}<NQr1f<E-x=>{?fp4oTQaXrGdU}+pq7noJ3aVjG_o31W^<v
zEeu1W9EKtD^Ya6I?yZ0jg6r$+6j>oeBFnzKFG;GoAuXwr%_6Q})ttz!KvoEunh+u(
zsuPy7{=96eEc>Q!<W|6>u{xP;+sw|+GCe(=go@fM%Swfh9?z;b)c(oI31??#DMhj(
zLYMChA(go7&&<p)H#e6eoaG7CBf2+r>vy|dPESvbW%aFdKn*QP?%?2n!^6WQ_Ora8
zlsjV>>A9ee-Nh$&4rD2?y1L5J($avXb>b%DWLdb;Xt1}pH}L(D%V?GoTU%S~?Cc~K
zcN`}bN~RppJ)nC+hE!fYxpP3zhqbjemY0_^t)9mNSzc%~8tm@wlBcM=RS2o$8yg#J
zZf>UHUr%N|iS;~CE0DaJzV~1uB(bux!s6oM(2d<N53H}Rr-%<D`Jf>rvA@61(b18y
zgx*y~Z*FcfD~>5|MqbEt_`Z+t`>D9s6)};?yTax*Xs)e9o{#AJAAKFTkAX(ojgGqg
zy$`{MfK=c{C7@c*bzK$~7RK_Ea$;g)n1TB0Z{iPt7ErpYl8h6I0wFL5{G*P41BiFv
zL_z>xo6d!P2R^G-t5mDiM`is^r$eXH0r&&>+?2#Ud9+fkR=K#iAP9o75_esfsi`S~
zAdm|5a#f)q2vTP<V>^oL_bHdn2Zgq2z_d3R2ZpT$Mg<;IB^t&>51~kwE6?+&R4VlQ
z{jriSm&;Tt70%DkQyfhS`~^H~x7)a`i*4Jut~+)Q_`XlO-A+yyhduiVaP^4SfXmy1
zXyg9_+}7A1fW=`s@_*+s@ErK|b{!~Cpg@5F1pxRDMh(|PZ4UJ^00000NkvXXu0mjf
D)E5cX

literal 0
HcmV?d00001

diff --git a/src/plugins/48x48/project.conf b/src/plugins/48x48/project.conf
index 512c3fd..b50271a 100644
--- a/src/plugins/48x48/project.conf
+++ b/src/plugins/48x48/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,phone-openmoko.png
+dist=Makefile,phone-n900.png,phone-openmoko.png
+
+[phone-n900.png]
+install=$(PREFIX)/share/icons/hicolor/48x48/apps
 
 [phone-openmoko.png]
 install=$(PREFIX)/share/icons/hicolor/48x48/apps
diff --git a/src/plugins/n900.c b/src/plugins/n900.c
index 947239e..85cea72 100644
--- a/src/plugins/n900.c
+++ b/src/plugins/n900.c
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /* This code is inspired by existing work by Sebastian Reichel <sre@debian.org>,
  * see https://elektranox.org/n900/libisi */
+/* The N900 icon is adapted from an original work by Luc Andrea, CC BY-SA 3.0,
+ * see http://en.wikipedia.org/wiki/File:Nokia_N900_Maemo_icon.svg */
 /* TODO:
  * - test on actual hardware */
 
@@ -41,7 +43,7 @@ PhonePlugin plugin =
 {
 	NULL,
 	"Nokia N900",
-	NULL,
+	"phone-n900",
 	NULL,
 	NULL,
 	_n900_event,