From b2615cbc409f6c961d3bd660baac6ff474303b4e Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sat, 31 Mar 2007 09:06:31 +0000 Subject: [PATCH] As per saturn's request, convert forecasts module to use new .desktop stuff for efreet so that the module shows in the list. SVN revision: 29275 --- Makefile.am | 2 +- autogen.sh | 1 + configure.in | 1 - e_mod_main.c | 2 +- module.desktop | 4 ++++ module.desktop.in | 7 ------- module.edj | Bin 3378 -> 0 bytes 7 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 module.desktop delete mode 100644 module.desktop.in delete mode 100644 module.edj diff --git a/Makefile.am b/Makefile.am index 21ecda1..f546000 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ EDJE_FLAGS = -v \ filesdir = $(datadir) files_DATA = module.desktop \ -module.edj \ +e-module-forecasts.edj \ forecasts.edj EXTRA_DIST = $(files_DATA) \ diff --git a/autogen.sh b/autogen.sh index d49b8bb..a9dc1df 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,6 +5,7 @@ rm -f aclocal.m4 ltmain.sh touch README +echo "Running autopoint..." ; autopoint -f || : echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 diff --git a/configure.in b/configure.in index 2e1ddcc..d3e0829 100644 --- a/configure.in +++ b/configure.in @@ -148,7 +148,6 @@ AC_SUBST(e_modules) AC_OUTPUT([ Makefile -module.desktop images/Makefile po/Makefile e_modules-forecasts.spec diff --git a/e_mod_main.c b/e_mod_main.c index 7b5ef23..ae7e31c 100644 --- a/e_mod_main.c +++ b/e_mod_main.c @@ -248,7 +248,7 @@ _gc_icon(Evas * evas) char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), "%s/module.edj", + snprintf(buf, sizeof(buf), "%s/e-module-forecasts.edj", e_module_dir_get(forecasts_config->module)); edje_object_file_set(o, buf, "icon"); return o; diff --git a/module.desktop b/module.desktop new file mode 100644 index 0000000..491ef45 --- /dev/null +++ b/module.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Type=Link +Name=Forecasts +Icon=e-module-forecasts diff --git a/module.desktop.in b/module.desktop.in deleted file mode 100644 index 0c91512..0000000 --- a/module.desktop.in +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Forecasts -Exec=enlightenment -StartupNotify=false -X-Enlightenment-WaitExit=false -X-Enlightenment-IconClass=forecasts,gadget -Icon=./module.edj diff --git a/module.edj b/module.edj deleted file mode 100644 index 58beaa6b693167ed248c3c03f2ea93bb6edec0d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3378 zcmZ8j2T&8r77cOi09{l4VA@VOU{+r+rhM^oGXc&qpJp4Zw z+rKU(3hayW^KpbDP%vl!(Q5f8=!zczKygGI)4CwMydW+p7y^z2N&x_*Lw~X;Fhm0p z07{rQ*bVYqqjvwZ88AZ(vLlXZAg&$|MY_`6w>EARL6ueZuT0h~GVfs7E_VbcX{VQt%Xz&+uM3u3#d0(U-`_kv_dul1jCUR5v zK@%?1JI}>DEyT`PneQu>l|@BgTi0Cn1%aqp8u~z=w<2O$dU>EnB)gKqk1Sf~m&JgC z6=P1jl6CB&*kfwk55}eQF0Cp0pCI-4*=k0A>kW8j^PsN3I-=s|%Ve(!d)C$<$YK1f znk+$%m90t@9I{9-+T&Q8VG~W9@xo0}CG8)BG5NHEyFm9@O=Ust*G~ z$h1P{{UnP;s&s?%h|H5?gY))GJk{e)?~;^*{n=ipyr=wE6KL{=!xI{pqE%BjBbk}f zR;*2StAqk3(p5c&kn2J3?z)w)bb_tE-!~E4Y8;Q;r|KqkVsx7n*-CViDYGxu(VOe? zB<$F1P1DkNU#h2UgjLYPNKAr<{Rqqx&XaW#-RU`xvAyAw>5}fXO+}5Vr-G_3#jfWe z11B+QiHk9yDm3W=#P0?JDv5VN=SDMvc_67Lo#J%q~<84??s9(uZCy*R!z$scPy5ZqhkoV9mm z?%>$p);;7@00|vFD>=FhUoCJda9zx?9*Q};h@(<+?(SJ~?vv5c$USc~6ogJK4qzdah6HVCuLcFkNWB8hues2affvKc=NdpYjW*_EGB><_ z%P+cS-dO4aLXUb}WU#@C;c4eeOUjn%&0Vz}xM>o6j#2zECl}c8_2!|r%IbtZVNlJtpYOTrNZImr5DhiR*S@k% zl`hH@ez^2>L+iD`llxmz9mptCZ|dTbFY!w@Z2z%!-G1+>Mw{m`UB771vk;&#a8Mgp zlYqpr-`W6Qo_d417r5D4bjUf$ZY$@>#y<~n~w-Luo`h}X1{-F7${Ps*!;^cDFUvS@*3Wo}LEV6yIH zgl!Tycx1`1lG;+j_#;<-IR~oPZdDV8<8ph$4Jt`hj+e{2zwJ=E2)sGg|L)<$XU4~C zSI3O_xTTML+P=hIn@r|(16-!IH#_+jzx#H#dNfH4D)g%UPtv(uFl-f-%V+#GI7!D3je4KsQd+~fAeFxBFTU(eyMc7z}SH`Hj z?|kEUOwbnKnc@MviSsqFUr}#%_gSD>Uv1(j<@O7+ zx5j~fdZb(JWf^?MeY10}+pLqmt$x#aOU;?eIL&Q$7L45-vB-E}(PtdG^^%?C zoPR~#XptR6RC9C1^&Q;+Q6GPKG16&o!9=aw5{!r$Oh-Ub;zUp7cPt_1r*4Ai+0aMEeS)-0*zwX0Ze+I03^tZ~DYKdN8P^ws`^U$A z)w?*bp!}p@EKZzFoTcD;0x^)|g{aE9^&Oyz;>OiltK z%TXq*jrygHkQ}IHqql#lz zfx&1ntA+e)v2J)NIdh9q1