From 6433841776b191be8804ac08c0f4b20a9d0e5008 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sat, 24 Feb 2007 18:46:22 +0000
Subject: [PATCH] Add icon to xsession .desktop files.

SVN revision: 28460
---
 configure.in                                   |   3 +++
 misc/.cvsignore                                |   3 +++
 misc/Makefile.am                               |   6 ++++--
 misc/{e-gnome.desktop => e16-gnome.desktop.in} |   2 +-
 misc/{e-kde.desktop => e16-kde.desktop.in}     |   2 +-
 misc/{e16.desktop => e16.desktop.in}           |   2 +-
 misc/e16.png                                   | Bin 0 -> 1524 bytes
 7 files changed, 13 insertions(+), 5 deletions(-)
 rename misc/{e-gnome.desktop => e16-gnome.desktop.in} (80%)
 rename misc/{e-kde.desktop => e16-kde.desktop.in} (79%)
 rename misc/{e16.desktop => e16.desktop.in} (77%)
 create mode 100644 misc/e16.png

diff --git a/configure.in b/configure.in
index be3bfa6b..930beb39 100644
--- a/configure.in
+++ b/configure.in
@@ -302,6 +302,9 @@ config/pix/Makefile
 themes/Makefile
 scripts/Makefile
 misc/Makefile
+misc/e16.desktop
+misc/e16-gnome.desktop
+misc/e16-kde.desktop
 po/Makefile.in
 e16.spec
 ])
diff --git a/misc/.cvsignore b/misc/.cvsignore
index 3dda7298..a247ed1b 100644
--- a/misc/.cvsignore
+++ b/misc/.cvsignore
@@ -1,2 +1,5 @@
 Makefile.in
 Makefile
+e16.desktop
+e16-gnome.desktop
+e16-kde.desktop
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 4cb07ca8..f3cc5114 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,9 +1,11 @@
-DESKTOPS = e16.desktop e-gnome.desktop e-kde.desktop
+DESKTOPS = e16.desktop e16-gnome.desktop e16-kde.desktop
+DESKTOPS_IN = e16.desktop.in e16-gnome.desktop.in e16-kde.desktop.in
 XCLIENTS = Xclients.e16 Xclients.e-gnome Xclients.e-kde
 SESSIONS = E16 E-GNOME E-KDE
 STARTUP = starte16
+ICONS = e16.png
 
-misc_DATA = $(DESKTOPS) $(XCLIENTS) $(SESSIONS) $(SCRIPTS)
+misc_DATA = $(DESKTOPS_IN) $(XCLIENTS) $(SESSIONS) $(SCRIPTS) $(ICONS)
 sesm_DATA = e16.desktop
 bin_SCRIPTS = starte16
 
diff --git a/misc/e-gnome.desktop b/misc/e16-gnome.desktop.in
similarity index 80%
rename from misc/e-gnome.desktop
rename to misc/e16-gnome.desktop.in
index 0dd052e5..8b82dfd3 100644
--- a/misc/e-gnome.desktop
+++ b/misc/e16-gnome.desktop.in
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Name=E-GNOME
 Comment=This session starts GNOME using enlightenment (e16) as window manager
 Exec=starte16 GNOME
-Icon=
+Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
 Type=Application
diff --git a/misc/e-kde.desktop b/misc/e16-kde.desktop.in
similarity index 79%
rename from misc/e-kde.desktop
rename to misc/e16-kde.desktop.in
index 01f072f6..89dd47f0 100644
--- a/misc/e-kde.desktop
+++ b/misc/e16-kde.desktop.in
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Name=E-KDE
 Comment=This session starts KDE using enlightenment (e16) as window manager
 Exec=starte16 KDE
-Icon=
+Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
 Type=Application
diff --git a/misc/e16.desktop b/misc/e16.desktop.in
similarity index 77%
rename from misc/e16.desktop
rename to misc/e16.desktop.in
index e89a4935..80b6deb0 100644
--- a/misc/e16.desktop
+++ b/misc/e16.desktop.in
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Name=E16
 Comment=This session starts the Enlightenment (e16) window manager
 Exec=starte16
-Icon=
+Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
 Type=Application
diff --git a/misc/e16.png b/misc/e16.png
new file mode 100644
index 0000000000000000000000000000000000000000..16fc7b7b5d7bcd2176ee58fab870b6851cdbf70c
GIT binary patch
literal 1524
zcmV<Q1q=F#P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*8&z5FD&+S=m7u#1%XLK
zK~!ko&6;g!mQ@(Xe`|BL7niBIG6>fsDcV?WHRlxbrP7LQVp3Q(tXxcUn3dE5om6I2
zpw)*!Dx!i!7Z{ZvB3D6J^kOr6A+-e&>YA=Oo11&-!~PGQuFli5=Q%gJ3vTw@=bZbT
z>pJIp{hvW}bgrju;t<EBOy@*6SGi}tndUtcC>;(0qydvmTMkfZ#@u4Y%vHNflg@?!
z1HgPB!)faSRypsN0P}!cr)`zS#b_jO-I)*|3rII@e*$ZbZdU<U>AecbmZ0c#t~WNY
z0XS^t9U;MpTGj40$6pNeI1H}S$@~P&0(JpSzz*3$i~3h<{375qP>^7q$mj-OvvU&p
zKtIq0)Bww6pgD1DW)v_LxEH9C@I7je?fh0?TC&C%k1~K>=RF<xPCHx&OaN8_n}B^9
zGXbaoE(b1@Fx|ir;Ah}7;E={n0UiY!fWLs3fU&?eI;nVk44Eo`BGcBO$@c(PsBJ9p
zFtArAGLYc;QR<ej?@RRU0Pv7muQb%{J_|er<mvq$;Ax#kj*PHl2u%B)lfW}lp-kXK
zV6oOYA9xN}AFB7+!1us0V4I_#Q-K31GH#z1V7k=#TA&eV2fmVE!Biz3T%z}-(rX_x
z9l-m*lR&Ku_Ce|Q*P6%oU5`!|;C{u5xlwtaF~H;ceV-<`4D6R+xe4aFR4Uo-nWIn4
z13aPF6A5L=Ki??7?Jjys20X$O_$Di;6?#-5A9&Lv#A&UQ?g^YhbTM$$EcS<V*G<%x
z0=pF(tZKb0bxe0$_zKUa904whI*7ex7CE8p({*>vLp0hijC-#3xZgLTWWLm+_tj4S
zO+aUoo~Hx2*|=-Bzt_pBBH#U8rUp0}5C<xqM9{kB*P~#5v|+GMDFE^~2LofkA;)vw
zW%@du0Gcx0W+wgA>02LBAggyyq1E&)46O%jNx0qleOW{*S|iVN3i!bE%?O?RW3wYu
zjPSMcNTH`t><Htwe;6vjuO{4|=NVJz5j5FnndX{p+7E=P&}ip(x7?qlgIaiv^7>Th
z0{v|>?RlXB47K>_1D*%UfX`D9pgUFm5)J4ysluoP<A0Fh)&CDuK5B950GCdL+Q1&8
zlO;)fTdbTuk^c8Oxz7sI*A#jJ`^@|FBm`(yS-L?EARe_kSW&s@+aG!Y)n-R_r#R2m
z+KhOo@Vj7^<EH)gPyzC_du}RG6afBi@}$r4o-P$r!L-v%yfbjVN<lM;1lS%`Hag3b
zuip_kXO2L!cr|jr>?aaR1K#uG^JNjtJv&ZDyCdp~tWaRCyGU!YFkl?Y173Dc`8fWI
zk(4P`U@!5gQkP)HWDD?Y59%-v_yt%X_nr}z09k@LP=xjA>^I8Y6T#w>RYx3k=ClY1
zf^o(~CBPiH&l=goBXO{y0WtQDm|Q8Gryh7s2w$HmDGNO7-6`X)ih}t};7jR$qo6++
zygF)&pbmK3tT#;%W}EV=?9f!=G2j#J)Iwl9@PaC*A{G4oDQ-@$lEqA^&L+X~i?v>(
z(vToH#k$Hh+PS?>Vpj~jl0;?p8?aHH4Z-xWq_M%QSCl9oBy+)$CQ#~_vc@do{2K+_
zW-I7b$XLe<a_kh-&A>+tUXt`n@U_4e<w9HZ-Ie_NA~59(4m|p~)xkkW@y|6;ozUfS
z!6a#(jmlM0w_FaPOM>J(?s~J_Y2=i~;N_cZGX+Y_7U_MpgZIx77TTo0Go1WqoyO0X
z@Wlz%iG)Ua5a?TFcs6H>)eOr_!CoR&Sm1n9FNSU4%;F4CtqEKe26h~$B7dCIwvEBt
zPFKGl2u%}GrFI3b7)=DeW$-o<F<%C}>Wn$8x*#^DUp~K`VL+Aq_adX(6L)4ZOzEur
ayUpL-mtL2<oo2}Z0000<MNUMnLSTaMo7Tku

literal 0
HcmV?d00001