From bb93738ae9be745e6bef4871449e38dda5295e56 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 1 Dec 2009 09:40:30 +0000 Subject: [PATCH] Remove EAPI from functions that do not need it. Create a gadget that can be added to gadcons for switching policy dual-app mode. SVN revision: 44083 --- src/modules/illume2/Makefile.am | 4 +++- src/modules/illume2/e-module-illume2.edj | Bin 9866 -> 12359 bytes src/modules/illume2/e_mod_config.c | 6 +++--- src/modules/illume2/e_mod_config.h | 6 +++--- src/modules/illume2/e_mod_main.c | 9 +++++++++ src/modules/illume2/e_mod_windows.c | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/modules/illume2/Makefile.am b/src/modules/illume2/Makefile.am index 916e1704c..9704abfaa 100644 --- a/src/modules/illume2/Makefile.am +++ b/src/modules/illume2/Makefile.am @@ -38,7 +38,9 @@ module_la_SOURCES = e_mod_main.h \ e_mod_policy.h \ e_mod_policy.c \ e_mod_policy_settings.h \ - e_mod_policy_settings.c + e_mod_policy_settings.c \ + e_mod_gadcon.h \ + e_mod_gadcon.c module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version diff --git a/src/modules/illume2/e-module-illume2.edj b/src/modules/illume2/e-module-illume2.edj index 3c09021b6fad9411d880b89d2dd70cf2577e16f1..0853076b4c3c7d3186ff07c54a74590019f43f1c 100644 GIT binary patch literal 12359 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 AhyVZp literal 9866 zcmZ{n2Ut^Cuz;g1MnFJBMClf6NKjD$sfuk^1zkHW8$t-7B_sh7x?%$^Oa{^o|njlB2n_Z?^EzjNlEGiS~ORl1~iqEM(mU__!&veqcn zoB|XIEssJ;OaPODF$aZ`TY^F@l$#j~#DR&yfJa>e{`m;*9V`Ro9g=3p;G zY~%qw3K$mTycxn{dw~&vA#=6)eq&&|fsL$rH=kJo^8;H%XfDiKa2l8*40FC8%v*3B zY-D}w`Ai+yEwCX^D0@ER0E2w;_P>VDDuBHJCW_d|19~g4*C5qr2#-|)>jS0=!-MY! zd6Y!*KvxEa zoClICZ$5{5k=zHi6k;O}=w85%^Zi2jYzHtrFyZr91&oCF@g~m9g>^}K09ynj00vSo zuusX0ASHzSsK6qCA$tzxf8#u`G_dCj`6&U*oi*1GSP3xR-uQDj07G)WKxl3Uu$o!% zpgtv=fQbqDMFaaf%MaEjiJY78T7rQMBMipB{O=-pp5!y6W{`7bLpqW35zZClK}rH) zFo^uQP=8V~0zZ(**#`iFd&~24;rkf_gR}c>zdFDm|0pyJ8sEfPsW{pq2xJ^W^og1N^!F07KR(TrXBo(nt*mvqQj;vlM1Nz!YXN=zr3% zKa?~-zCY;8z(meSxOSnhNgE0IA?JJ;*g*l~&xiXX4eLQ6wPnR;H-HflhS=c-AcE7PWFfY%V3weu5y;oQS{OS5OOZeXLcSU;2$ za`wV=p8-SiDa?KVTRe-k0aKpEz5!c3i@_N!MEbL!#`l7L511ZEBE%z|0Yb_#hAHyMbBEVsC&!u7C6U6BuO{gSuVl4NSOauLX8-7K6H7comp%y{H4b z1#B^Y9mv|}0LvH51qpjVeFgRsB+?5n@_p|C`vA5K45a3)VSEP$=Y(3u_c;uD53q3o z<8xS>43c|!#6}*_1Au7=7)V6_3~VPzUOc{EBQVQZ4Av_{2Zr=n2H!6O*d>G^Hu8WD zJyGT+NM1dI+yp}h81fq>V49%AZ@0{2ki0$w64_%Ih}Qzfj|cTFQwMAj-`pk$D>AP?x}z!E{q z%@7_t0W2GstPuME4CxWV>q`X&dHAi5LoZ#_Bw!$QVL<&Yf_pgg`wP+m2Hg8aNWT}3 z=K*YF78{0T%$>!&fJq7%$fYo#m&zhiPzOjKxB?8xJ#TLyx58Kl47umLzY{^iS)d5O zjD#3+zrmJ8@+;gE;qMLE{X%|7Ux7XV|S6LupBa#iQUbchD;{G8vZYr zndM^bNK_Q^u^FF3I4T`$`fFGJD|LX)h6Xb&zm*>3)*}5%`MnJjZTnH%M76|tC zuuj;kJB@%Pc)&7gC@O&hX%JW>qAM9PV(*M2(oi%!4q{NqBv(3tiiHe;0UIU3WD*Ta za;1@g;GIbnES-#nj37~Q&fx2cqeBd`D;?`XfK1?NC_92Z&fS@gqS4_MhPR@PjExkH zjeO#Pb9N`7JV-Q>EqoGQVRVs~IA>T8hQXIils$<-u)}!rr31=^-E;z zKE)@3I5Y2mrJLvdU#yw80-Gt+TXzv?cq)m4{A37v5!MbE%8rU7@}e;QQ<1g-C;sad zp6m{-Ob9Uld&lz?vS)l}0eg}wv`oAIX3g|o1R*~a%$eTm0u7Sn46gsJ8wI~M(4#3- zG6m^d(BFQk4t$l@^=9Zy>*MVcOLlb@-v58UEi*p{a2eqjjf&?dS_v*6D!=R_*&29e?}KXFR_1ATykD4B5-b}_RiR1$t&GKJ1;Id zwDP=T>59_jrFe@o*~X(;@j+45Jy+<2hw)Tjv9XBT>M=?Vl>6C>BPK&ukUma06VGSU z=U3D`@OZz|p}z59E`c^l2j8~d zoN#&DdPCkWI;}+Id-Iy7=o;4YVeehzs?|Tu54~R}r=M)wb+q?Pf7{mW%-KRgGF4XB;$&?R^*EpUP?c)HkL4zy$t8LI(Udg*QO_ zdKh#18pX0}k1Z3W1T7^TRWg|;CmORuL~P}pcUvS^#Jc1b?21E6XlL!ns0p6uviaSk z$f^xnv#xL6vPi`&(w1~h?{Z9#>{Mg%cuPr-VP>SY0bC`%4xmLPeyhddi^|EljBscy`A1o*_Zt4v(2PCtHpPqLZ4;T z_qZpmHs7t|zRb!!M?c(X@EvJRU2b~*=#$<@`*W(z^p8!B4X2L%{C;G(_jA^dntRnZ zISS^1jeVCtwKf*}Pp=qa`7Z*>(qcr?d|>1-r5yXk}6Jd zp7N^Ujjm7n?lTI@JXudiY$_8~xKGwh4NpXf9Gj<|TaK=2n|Gu=tn|{Wh@sljAlcNX zoQBjz{u5|Pg`*vb4Tm}s6%GX%PknH84ZP6!t@#a}X-H{%=E!A#sWlq!Jp!-u6N;Oj zC7QEaJsMpkrfCg6CZR4FrjD(K_xf^l!q3w zI=yB26wxU)yK!p4wqi6sgs5-d8~?<;r_Ru-ZgIaZt9W|q>L_`FJ5byGA-Udrhh~!b zDRhihcNsbcUFWbruA%PLxA2U~mJLl2dDj0986J6;61>hP-*QCBhh0+ZH{N&RV1hwG zl*F*bV)Mw@LvBz0HTW>SZ)3?} z+kYgykkaqH5~EE#PW$%$9IXDdveb)n|+%Rv)}SYS;TI^QV_X z-GftkmGSy{>s;cO`1kG>Y57-T%-L9n?DbBa^QJoOO=F*Sx};=%OskZijMcJ<&AQVQ zL+Lj86kN62D`n5VLgtXG0n|C`b(g|4wXc74s4LwjZg4?k|s(yezrd zM%eZ*Zg=hodYW&CQCylHK22x8K#jD{lb@Gg)lt~iRl+)>XqjRA zGT1Uo)6!$|U$yP=;jG#@k`-cwBcp1=wye&Yf0!BSj3oEoh&=B?U9NpV2YId%Wz4-T zmSvPKSyjBw!O_to$7gg0RtAKdCNl_{e<(R->{S!9*m+YFRHQ;S2@X6kP%GUEJ1 zVJCbQrsPhW54;kqSDdSGcKrSX)6kqP9_lB@4y#l}w~QXRyj|~fWiUDfSDls9mr#?g z6gd);nETGgHBWvXRxCuGeEsDj@>Ubf^s0r^PG@>V6wY$WGreUiJ6KGGD%PNhcgy4s zio-MF=Oe@3+j~$`l?xu7Xx!FQAFoXg#8Z(Lw3m+-JH|^-%jwRCQyP8GJtv48T;x9=bo#SdTfVFCzImOlX@ctA z!#|AD?|ag9wV$baD!pxO9~(DOeqFB^(Z63yqA=AXcx$4=t2@^}mgSv!pNJla8$CZA zLa5%;yv_XTry*<|Lq9fpbEWF=xo4jS%1j@GS{4?|R(*SNTB%K1PpvCLq5f;7dK!}z z@{DFI&Yk1$@12NIozE?|coCcYK_w|~bg$&!mma0H8q>ILcmDXMF)*(~POIKb(oEvL zWTA^$hv!yIWc1fox%`h|$6M$7d^EFUq-ti5+Fo|=TtLHdLVQOv4y&xqtW3D2I8Bhw z8*dEk5Sb`lfVDX$!Pfcqz}Jxys>O~J$zTk$-(Ke#-M;=6sk0z`Uc=$>!sI#i&HkQA zQiF*Kx0YuxF=sx%)scnv!#ojsRTe+C7 zQ{zg@+NQsnG_kk(`GnSb7Thr6(ygtze$QBgYR3x>#Lz=8Feb9x*Y*uY=KHU2dl)YI zS^MDM=<;)Y1*lW*l;@WQqqr%<2BM4gX@=a zUWwr8EK|)xYeKA*??hZb|C-MH+xLo7KPk}W^GIF58cC~YSxoTLo^RIP7{8+tA(@8U z`ueBW%X{hj*xyk82IdPwLc5HWt|f<>yB6wftQZlUiYlI1k-q$>mc&!qKr;TzT}gIW zzI@eT%j}=cesQXesZvp&hN6cPvgQ{Z@ec_<;dV8yJ*>xju1&NmOT1;7l1#?jP)cNF zfc8PFBP+iLMSDtQ-peNGqeSKX4*Wf?evE;80?dzYIQXq%pL*SjIN zg?TuM^Tp1}HXxOi7Ifj{3nvj;XOD%88QMb2>(&t?6PVlvrfHjD>|mImPmw02 zd5!yTKQ+ZcCE<6H{3{U=%oMW zfm-j@CfkHJpNF?hwmtW^T~KI|AJx!S__jb@SDw~NE5i<&U^))S);GP7G469nHhJ(J z-EiX|ttZQ#dECY#A_m>C0^NNlYOpBB&#$;)q+rg}SaLyORPuy1W2|4LLNxzUa%RUx ztya^Z0z=7u>RJENT5qn?-Uq{?gC$F^>pfLthfKXo2*5r(rc*D{qTz1d+m|qi`tVRwM$91J_&BhjM}XHj?|(cL#`Ax4pYd|+r&xmC{+k6lc%4Db?A%F2E>*No4W>f z-eWn=H7rc^P0HHFeBCntJ~GWbY1?^T-(&AUTSSvPOe*7>syd6 zZ7{G+%I4+%{wTe2l`@-(qGpvfL`C^eJq~n{RWLOU2Q7nFRb@! z{EcFRWKqfM`?;F;dnHPTj7e(dH4B{fHI=JZic8Js9`K20Su1dTZ~o+du+urKH*OdY;JE%&Wtws^PHhjFqk)5VI}Vw&7QEpAmz=H#QX?>fuevW>TeyEu~% z*_yBMI<^1)3xg9g2@_SOP zLjDk4@iRq#@~eGNF_*o8HRu*(jM*Jnx4o0)J{p9#PKj{WL;Gyln-s224^JsGQ1X9R z8wq(;^`HDvY=kb|_uwu0&u`@$(5nZtKe@i2{*l;_#EBc4O!;a!ob8bGEj4fKP++Yg zlVYhR{loq4$eGM~r{yUV%?bmfreE^59ZWkYW*J8v|L5&zk#+hbcS@V(6Gl?vo`|!& zS}#3e?h9St)b}t^_S%bbqGR0X!L&S%|GnutamN5=wfB!Z!$sTMeU57;iG&WnlKzHj z=_qLzD~e2fDgUsi_+;)pvPj>ex~-W5u_yZzUi+Tlw#L+0#=E*E7ff~DoEo+EeID0p zEORpTWR``<$>QKie+#sn^feJfvdTu!yNOec5*7`OpR(edYEQcFX>|-6b1*1V-&;e# zYd&TN#g=4E%%wX{<$6tCXB9+!YEfuO9W?jFzM(bTc`{Wq`ux;`he3Un4^DNa7ho~( z#y5|+tmO>bP_Qahe`&HCjV3z-r#a6b|7}zCoLt0l;9$16dGvWI(=sv#Zu-cm;#0!i zMb1`71e_R(Pgy2_T@Q86jMefr&J*18IhS_P*AMAI#r-X;n|S=vV9=1!JQ)T!J(L#=Udj%~Fme7S&( ze}y|zQ15h@&Q9CraM$m(gvH%8V>d4-xncInjwwbw#`#pN=Ue9uP@5yO1SbJww2HO&Or_9c|%;7=YyC*sGcBB2)TD+EQ_;IOXFxBDt$}+p@ zKNXA1t1b{rFPfD}*IlccsIR)w&n(O0GUfNWkd8Fc<*~#o+`$yRRLb$z(5n|hm4E2D z^pAXtN_Z`45ik{O>|ncrz6sN?bfs^Ie7D_%;u-I9^WpCu$}C4y%Z8dORqC`{9?U*SCo}K${g6%{&>nV zIV5wc`ctC#aAg$hVdJppO5L0js*3GHbhj}b(cb*`j0Tr*L#G!T7oM-J{fVX<6zBdbF&CXYKTjZOEsE_?Vt#g0zNgDq^)uUQt zlvSI$W)PcN{B-4H((}+^$8Gr^%HA*0TVL?=^e6KlP8zEZ_*_}?Lrx{+}r~P)DGLPIJ_g-pRx^fTw-!qLb z-ci0rYZeTB5Fe_1B;j!nlhG7BIoDu6v76CA!CqBs$q;JQdata for convenience tracking */ return m; @@ -51,6 +57,9 @@ e_modapi_shutdown(E_Module *m) /* shutdown the kbd subsystem */ e_kbd_shutdown(); + /* shutdown the gadget subsystem */ + e_mod_gadcon_shutdown(); + /* shutdown the config subsystem */ il_config_shutdown(); diff --git a/src/modules/illume2/e_mod_windows.c b/src/modules/illume2/e_mod_windows.c index 1c06d24f9..621f83d2f 100644 --- a/src/modules/illume2/e_mod_windows.c +++ b/src/modules/illume2/e_mod_windows.c @@ -36,7 +36,7 @@ il_config_windows_show(E_Container *con, const char *params) v->scroll = 1; cfd = e_config_dialog_new(con, _("Window Settings"), "E", "_config_illume_windows_settings", - "enlightenment/windows", 0, v, NULL); + "preferences-system-windows", 0, v, NULL); e_dialog_resizable_set(cfd->dia, 1); }