From 617e245cd948f3d3e9f3a73a757d211f6df96e25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Fri, 22 Jun 2012 14:11:05 +0200 Subject: [PATCH 1/1] Imported Upstream version 0.1.1 --- debian/changelog | 8 +- debian/control | 6 +- debian/copyright | 2 +- debian/postinst | 3 +- debian/rules | 2 +- src/usr/lib/hildon-control-panel/libcallnotify.c | 137 ++++++++++++++++++++ src/usr/lib/hildon-control-panel/libcallnotify.so | Bin 22221 -> 0 bytes src/usr/lib/hildon-desktop/CallNotify.py | 30 +++-- .../hildon-control-panel/callnotify.desktop | 2 +- 9 files changed, 164 insertions(+), 26 deletions(-) create mode 100755 src/usr/lib/hildon-control-panel/libcallnotify.c delete mode 100644 src/usr/lib/hildon-control-panel/libcallnotify.so mode change 100644 => 100755 src/usr/share/applications/hildon-control-panel/callnotify.desktop mode change 100644 => 100755 src/usr/share/applications/hildon-status-menu/CallNotify.desktop diff --git a/debian/changelog b/debian/changelog index 272ce6a..ba6aec9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,5 @@ -callnotify (0.1.0-1) stable; urgency=low +callnotify (0.1.1-1) stable; urgency=low - * Added dependency to python-runtime and python-xml - * Fixed bugtracker link - *Added request for restart after installation. + * Should work now with PR1.2 - -- Omer Agmon Sun, 11 Apr 2010 20:43:14 +0000 + -- Omer Agmon Sun, 30 May 2010 22:24:54 +0000 diff --git a/debian/control b/debian/control index db89d81..173bc56 100644 --- a/debian/control +++ b/debian/control @@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 Package: callnotify -Architecture: armel -Depends: python2.5, python2.5-osso, python-runtime, python2.5-dbus, python2.5-hildon, python2.5-gtk2, python2.5-hildondesktop, python-hildondesktop, hildon-desktop-python-loader, python-xml, python-runtime +Architecture: any +Depends: python2.5, python2.5-osso, python2.5-dbus, python2.5-hildon, python2.5-gtk2, python-hildondesktop Description: Missed calls and SMS notifier. Will display a small status bar icon for missed Calls and SMS. The icon will disappear after closing the yellow notification or viewing the SMS. -XSBC-Bugtracker: XSBC-Bugtracker: http://talk.maemo.org/showthread.php?t=48501 +XSBC-Bugtracker: XSBC-Bugtracker: test XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACx jwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41 diff --git a/debian/copyright b/debian/copyright index 090df17..0d031ee 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ This package was py2debianized(0.5.3) by Omer Agmon on -Sun, 11 Apr 2010 20:43:14 +0000. +Sun, 30 May 2010 22:24:54 +0000. It was downloaded from diff --git a/debian/postinst b/debian/postinst index db668de..c794ff3 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,5 +1,4 @@ #!/bin/sh killall -9 hildon-status-menu sleep 4 - killall hildon-status-menu - echo 'Please restart your device after installation.' \ No newline at end of file + killall hildon-status-menu \ No newline at end of file diff --git a/debian/rules b/debian/rules index 06e3080..d31e215 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ install: build mkdir -p "$(CURDIR)/debian/callnotify" # mkdir -p "$(CURDIR)/debian/callnotify/usr/lib/hildon-control-panel/" - cp -a "src/usr/lib/hildon-control-panel/libcallnotify.so" "$(CURDIR)/debian/callnotify/usr/lib/hildon-control-panel/libcallnotify.so" + cp -a "src/usr/lib/hildon-control-panel/libcallnotify.c" "$(CURDIR)/debian/callnotify/usr/lib/hildon-control-panel/libcallnotify.c" mkdir -p "$(CURDIR)/debian/callnotify/usr/share/CallNotify/" cp -a "src/usr/share/CallNotify/1.png" "$(CURDIR)/debian/callnotify/usr/share/CallNotify/1.png" mkdir -p "$(CURDIR)/debian/callnotify/usr/share/CallNotify/" diff --git a/src/usr/lib/hildon-control-panel/libcallnotify.c b/src/usr/lib/hildon-control-panel/libcallnotify.c new file mode 100755 index 0000000..dc83af4 --- /dev/null +++ b/src/usr/lib/hildon-control-panel/libcallnotify.c @@ -0,0 +1,137 @@ +#include +#include +#include +#include + +osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated) +{ +char a = 'y'; +char b = 'y'; +char c = 'y'; +GtkWidget *dialog; +GtkWidget *btnVisual; +GtkWidget *btnVibrate; +GtkWidget *btnSound; +GtkWidget *slider; +GtkWidget *lblText; +- Show quoted text - +GtkAdjustment * adj; +gdouble sldValue = 0.0; +gdouble newValue = 0.0; +char *fileContent; +char *fileDouble; +int i; +gint response; + +/* Create dialog with OK and Cancel buttons. Leave the separator out, +* as we do not have any content. */ +dialog = gtk_dialog_new_with_buttons( +"Call Notify Settings", +GTK_WINDOW(data), +GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR, +GTK_STOCK_OK, +GTK_RESPONSE_OK, +GTK_STOCK_CANCEL, +GTK_RESPONSE_CANCEL, +NULL); + +/* ... add something to the dialog ... */ +//btnVisual = gtk_check_button_new_with_label(); +btnVisual = (GtkWidget*)hildon_check_button_new(HILDON_SIZE_FULLSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT); +gtk_button_set_label (GTK_BUTTON (btnVisual), "Visual Notification"); + +btnVibrate = (GtkWidget*)hildon_check_button_new(HILDON_SIZE_FULLSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT); +gtk_button_set_label (GTK_BUTTON (btnVibrate), "Vibrate Notification"); + +btnSound = (GtkWidget*)hildon_check_button_new(HILDON_SIZE_FULLSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT); +gtk_button_set_label (GTK_BUTTON (btnSound), "Sound Notification"); + +lblText = (GtkWidget*)gtk_label_new("Please select notification interval:"); + + +slider = gtk_hscale_new_with_range(0.0, 60.0, 0.1); + + +FILE *inputFilePtr = fopen("/home/user/.config/CallNotify/conf.txt", "r"); + +if (inputFilePtr != NULL) +{ + + + fgets(fileContent, 12,inputFilePtr); + + + if (fileContent[0]=='y') + hildon_check_button_set_active (GTK_BUTTON(btnVisual), TRUE); + if (fileContent[2]=='y') + hildon_check_button_set_active (GTK_BUTTON(btnVibrate) , TRUE); + if (fileContent[4]=='y') + hildon_check_button_set_active (GTK_BUTTON(btnSound), TRUE); + +(char*)strtok(fileContent, ";"); +(char*)strtok(NULL, ";"); +(char*)strtok(NULL, ";"); + +fileDouble = strtok(NULL, ";"); + +// replace , with . +for (i=0; ivbox), btnVisual); +gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), btnVibrate); +gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), btnSound); +gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), lblText); +gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), slider); + +gtk_widget_show_all(dialog); + +/* Wait until user finishes the dialog. */ +response = gtk_dialog_run(GTK_DIALOG(dialog)); + +if (response == GTK_RESPONSE_OK) +{ +/* ... do something with the dialog stuff ... */ +//FILE *f_write = +inputFilePtr = fopen("/home/user/.config/CallNotify/conf.txt", "w"); + + +a = hildon_check_button_get_active(GTK_BUTTON(btnVisual)) ? 'y' : 'n'; +b = hildon_check_button_get_active(GTK_BUTTON(btnVibrate)) ? 'y' : 'n'; +c = hildon_check_button_get_active(GTK_BUTTON(btnSound)) ? 'y' : 'n'; + +newValue = gtk_adjustment_get_value(adj); + + +fprintf(inputFilePtr, "%c;%c;%c;%.1f\n",a,b,c,newValue); + +fclose(inputFilePtr); + +} + +/* Free the dialog (and it's children) */ + +gtk_widget_destroy(GTK_WIDGET(dialog)); + +return OSSO_OK; +} + +osso_return_t save_state(osso_context_t *osso, gpointer data) +{ +/* ... save state ... */ + +return OSSO_OK; +} + + diff --git a/src/usr/lib/hildon-control-panel/libcallnotify.so b/src/usr/lib/hildon-control-panel/libcallnotify.so deleted file mode 100644 index be2143f4972397ee4a263b34eaba3defa31e4963..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22221 zcmc(HdvsLCnP=VZmb*bhY9R>(Er|vp8^`Fu)3Qx$38|4}grrD~4SwX(>Tb2#YITe5 z7DzU+N$lMv566(;#Ce>c$@rZ3?0RO&44aS)PMD0xlVm-!x9^z3Es_Y zoWvXU_p3+iwnFyt*Iwy%)%U2cs=liFs_MIS?_;6BxKa||@z?LhD*-GloB z^Z6KA7hi@R0AU?&@_KQjyd6hH@T0zJ&-ac#9kxhYkK1`Q0k}~kZbG;L_szK9r*Y2U z77aA(u*FG4yww5!gWb3GFD`%T$iLqEpyP2GBURI^Ak(De(VrYh(1xKqHf_638_pW&H%L>_v3Cw>xG^O ze}t9CHHXR*{;7t~Ax`*{8a}V#5e*;H@DUAHYj~s1@3@9<(ez#oKcwLUI=@F2@&Aja z`!)T`8a{30Av9MIk#Fkyyp1@^yIadUso~G*^j9_fcbean|Cpwq*ZNqZ(?75I>oq*C z>E{f;rmxVj(U-0H+2>gvmxia1FX1-Ga0MD^=;94$9#aoNg|6o!2w-?d>7_hVaF8~e~%2y?XZ6_u( zX*-vXWb?Ky>|{Eb7xowekfJjYMkA@@!*OBXeaIe;Cz82*JlmCuCVnk!UnC zozCZ)r;|F}B8K=OWRuDy67g(-l1OJJztlB~`C2us6%w~$XC58o)<(5oE^s#I_o}ZnPeM2_5w-nScnwpO1GnxE2F;Y>9!Qc5pUvc}PNWizuP7daHCDMnAhFpaX~ zZHF0-&m?0r%0w5ScshnS&59vN8w1>EE@w~+ahi4sA)Sn?u&2LoXP3RXh10FRFj33P zgc>Xa3wW1Uh|ATfu>LoHTpwEEbC`cP$MLF8CYLeYHQ;z%z;v_{;VU|PRfn(X@S+ai z(BTywzOBQnI{c*$-_;@4zLa}Zhn)Wi_adyR5Tc)9y%0kTgF?LgSs_-SY8Mz{{(gla z)(x*RL|I>Bh(+*4hFJK%!O$nf6^2WMc$?u;A+9nk72=l+v8H^NA!_^{L#zn|@>>CA zcoFp_L24OdK~TqVr4T`ewOC^_T!l3V!`0X;FvQ}#jUg5| zTN$E$?F<`)*uiiO);tVR-)@F$kzYsi&qsxL%YXERE1rwZ^PY>R=F2ZWb zqr5LY^}6r-pLjj^+jH|KUh9ba9dVx{E*$Z9f3uMGsv~~I5x?k&zv_rzaKyjsh@W@F z&pP6#9r5QJ@i|BQ8AtrMBYw;gKkA6jIO0=|__!l}z!Bf)hz~j9y^eT?Bi`56YBwOgJ9rZC@MU!ArFDeG$)CM`?b=&b+uY@nwikZ}zAICZg>E2@<35SI z&3|gX4ZN2Bsf+I5iJ!4=P=;H4_#*m;uax?Vr1p)UZ1UT-(LVqV37~ z(_2v|ge8D|2*H234B;0&r{-NqQxcrJd=fm*>9j*_rSn6O{qQ2$!$vmpI-=uk;Jrc2 zT|Tbijes{I?Nf`=b~(~+tUfjW2weM{z zyB>VGMSM3o_+A8`4fwqK)ckgh4?=!<^HZ;12!7|%)!^S=`lkxS#raGB)T(gfny(Ig zZIHi4!=@Y+8fG~*`UCTgfXP?0h_A%Kw*h>sG+*f=zTf^%wIk)N2Os5Ap0$YY9S2_! ze3VbVUunE4-_IO;b>O4?(`|uy_UV1-!)INm=FcuaHUGBet3^F)MPU9l4bOrP{iF*0 z+uf^aKLU+BKfDf4x8`|S^L+n0JRO?nuRxn?+xF(TpJ9`zvaOFrA|w_0R6ub z4$fUdSuVZTxcd_O*9FaE>iZuYX?juLi-6gGURuQWM-IMj@ckGt`_H*We4lmjb%2lc zsso?Fn|z;i@V$nzeFZRe^gV<_2+uM^I^vz<^f3*yj(?`({m@T8+Neb2ET2uM zd~M~a`NuWg5Bf&P{D_9xE*k(ps$sUldcY5BnEGa!AJVWX^8pPr??OO#yQA47Yxk1&<<5?yXU)|yr7>2UGgH`S)@Cwd6$E?L-S%PUOEfj zGvLMa{3dqhmp=bFUf;M&Sv&JP(D7X`KZpA~?pJVM!TlcYYRu#9xDVit;U34GMxJMo z=NX-6CGxB~fB*dQi}%l0w%re#_vAd==Ut3-zX;6l@UNLKL%qvUm;0du;vPWAwyM$k zG5V_3F!i-j#bLweF8MC(e%*fz^Ze=Nc>()e2K($2rSoO}QfXt!BQAXWb>VyA3g(+j zwEwj4U04?f2QvBO*lchlp2uz{kz=j7h0IK-Fv<-~N{D-sx#@`JPDbVKTZ~}09a91f z3VfqkNnM1O*=Vky+*V;xjYx1ZnZ{-+cRTWJ#bzPiI*qM$Ym3?jwz7z-gssH1r%I*jS?hz>uh!_VpPv<_d;;eXNLWgY%E9lFr*5tVCKhVRqx?K-?$ zhqew6>F`M%enE$SqQh_L@CQ1a*Ws^qxCCos<`dB2`*e7R4*PY;H9wZW(yxW(uk>eO zxhj3q^dZwFhh?i=pVJ>l_+Ni_EknH`sh9zRKIa)^hGn%_0szZuxsN~=;{0dT?&Dp= zF~kIx(sF(O2{1A4K}g>p*CZIX@Tx&axOx5V+O^CZ5PA(E>v9$0M*#l@q3#lr@Bj2e z|GBx2qq6_MZc_$^($Ck^)pdJtL(jn8n}b{7c-kbWVKg8v>REXwze_di>t=+C{?jJd zutp(_^WqDD9XnL={{$#4%t9W)E}e;m?Q3LeDizPSMD-Y*jKn81t%oz&iQE*tBdr*> zS>+mKo8fYKN-)TUI|pZ@ofobjM3EDLK)9?MG!z|=WQ9914Q#t`-}Ff` zTfPFbB)eQC*vx11GO6O-v|YGw{tGg@yoy#xB6F7lw`>;f7MZ=TB$Y`gg7Qb^@AEDo z7Numtg?lH{c|2YeMwP+miDjloQ*lw^K@|&<+zCncv;@%a+zATzZ0bi^cLMItR6LRv zp3S|WxjZV%MY*x!!gH%ErN=Xt%0!^MgwD!yd!v*(l>ry@?Ag;yxTiCljm(OY8_xl{ z!PcO!%P>pq_rA$p>%L$WY8YmZDOI};lW|?m_qjr z+|$|L*DW4Z;P6nFt>{M-LIUv84SZ%BYa^f1w`4?z{^{Tq0Q`W6Dz}36{_Er>JsSPnf>Jr5UTV07<92SbE5M z7)h7el0)Ga^*`DOFw4q2Z&bGg8H;uQ7oOY&Mu@bpgq99p#((f+80YtN|+LS z9zMjVU`KHG3`*CkC_Vc-;Lv6oE-O7d0CVEizD(oA6s5mpvDllkan=&9c2W8(KEy#I zdJoDTSNiT_vQd2y--o9U@OP$W_og$4G3G_-HgPaxAJ z@Rh=iTtpR?dx*~HT}aU#&qcFInMy1ReodyhE)lB#JgDwnef=R(-f|J~8|=P8Tf)zj zw;b?7!}eGzf+bJIGK*ssH7h3zegF1UJ}WAgTR~YH&jOyVx{4}|_buQ@@kBsWRBJ++ zBplAdC2cE8ji&e=6q&~gO{jJdWF{*$p;i*$a@Ue-HNLKZm+Y%FIw;Z7w5yy0ny_B+ zN1_wcQ(9D=CT&ol2S7Tc_+|FenaWm z$xXB1~8u?~X7R1&0BO8`rbr^!Y%AQ|nn{0?-x-fAm)5BkL#OGJo_DAiVNP(DE%4SaZ@^ zMsiU+xDm^@8WrLRfx>LlN|Yjdx`aP=%m@S&^vC>Iy~=u2ecRLn4@9Tz89S3rVwoYT z{<2UZ;%5u^?S?GygQT9icARAajR zi3hP1mxZeyG=-Bjul_(i1i2c^ysab$2^^PV{$SFK^$|god^pwFEa2-l_-Py=t z8Z}YoPkz{FujW>*J*n`a=QO&`tF+t0p-UX$~ zHd)c8rPjztVllB|GbeqIwT2Co&SWPeDLWC(i4|KbWqbR*@fnzx>1rD#pf{Jsn+MK|}igvj~ZG6ThmU{dL*|eoS-Mj7nk)4=vheyI1-cx`rS-G9) z5QDNm`133}63@Pl@h20H^!Duv+j}}kb_+{M8|>PxV3&lu1_#2!gZ&ESk*Ga`-J2Bb zGw@~w`whHB!9fFWRq%P0DFkd&h@&dgoqNOK!2vDwsLEL3wBVyEXNA+kkE+}iPG@jb zl|bQ49;y^0dxt{9I@hB|6|Q%`6K6^n3U?OxbODD${h`j0&;q)kiN0NZM(nk3AH7&2 zRlX+^OO7SuS-B+jfBJD~-RGgj_jzb-e4bCCTlqYHjNi(&XlmYaPFVvi%^Q}Gm~VU@ z+E|~5-Pq@$RbT2^zL6$R>U9^I#^%prcq9~tpMf2lCQ}w-dFx$Bw$xMIPP-wK-_tj; zx3gca&ilITp5e~@#ROtTx;nA6Q;k&2-!<5e&4FqvO&J;q?d=}46~*n$BRsq}r145| zIz@NiaHuP+DN1$9^vN<;-}R_0^U61KvdrP#_TX?|XaL)ZzQF;z7r=d}eP=(*y@+^E zXgJ)5!b?5mCkC@T{GvQ+EB|>j#I5kG{EYQeBX{pmH})tf$UwMnVDI2wtU07ejqmOo zagd-6y!BC)&mPy;@X)ffx39k&#pb5R?%W$5 zwD0Zf4)-o1^mg{|8tEDig$6X)DoVF&Z-0Lg*;PcAVtYe5WV6roTaDFiRCM{@P8y21;7QRrhgM!wFff`d3Ai5$B2} zKhYU`XgZglY%aVOypMQBq5IW?}{p>XXOaI6)JJ(8cr zbQ0Kp9!0}kU=UYbf$euz>(T~xo9THhAp(Q@;V$DGFbZHu0lnUoT*L)FK-k^*goPb@ zc0vS(6@1?EP9|d_FrvWsEH8JyA`n*aS(jICH3EAT{7aXl+mVO}+@nyZ-Ix`z^$>x5 zv^DO=x82^um+dzg*)q!)sm=Dg?ib;nn_GlVJ>=9;VC?(P``w5 zZ0{sjT%nGYm?}!_n8JRsMAcH_611G|#?vLLq7pZ*aA&}m;6W-*^?`?GWfjhrcq93I zBs#9Q)`2wF4(`U6OY}M_Fr^R|O5{Q^+A*DhqJ21l<#eoCwU&HREo4gCcOSC!3$ez8nX4L|}FV>uGo6 zl@dB%Mc`q@h?9!!jl)shA8#8%=ac=>pt`NVZL@ejBF9hNou)^oaoAAQ?Nn|m_DQW3 zTM@e6M9Hu^mtCW-n`L)3u2)M&y?L+O^&82v0X;(0^{~6S8nFfg(5rwM)m!WOR98G> zsoq+5w}P))vZvMcEA2k-l0B_%j{;9)ofEaS7Lw3S-H_728A*@|vr}+=fij|$an>bu zQ@2-v=Ug@MG}h`k3^Wywa_)_Zx_k9v%-wk2B~^E?JWwP8p^rgH(u8TujzEaz^r~}k zqW-KgJ%vV>K8*TrKacj{Mn)Yus(CJ5Pa@areUhkus|4N7)wmTFD@!w4 z|BI)kuy$<1FyuKx+}D5UsFANRC+oj- zUjU*kh-|gVT2tqM=8PoC;T?p+Mqc(a@{#<-{+@Ov|U65FL%<7-38_^eMJw zWJ|{}Fic&s_fg%wVMwu*{T_>)g&RJg$fYDNBpQ}jw~yF7y}b=1665g@Gakv=e6ERt z7|&@#Sjll4x@-&4uvej7M8m5TNr?t+EG(k*=|XjU)HK3Al?M7&S!tc$r_k8(q(r9%p@oIAjgr|R`fd3WASJP4}GcL0}34= znrg7e`DCMERHEIrL?^O1znz~I4RMJqsUk9&Gbb+_5=z8!qN%rh29KT&#Z#Ew&{;*p zxT05rt~!^Uieu~F@DTB?#u<%7GSM)ha7Q!_J`=dA8dAi%8;@dZ%g$+!W^f93QZ!5| z{1cXUB0ig=n-fQ1V>W_V3ah$?jG`aIYAB88U+H9&em}XJ5)B8rZ^g>Q^1?$+2UbJ2 zRL;Z4x!uXbWu;HiiZ$EP7~0aBEFinrY~v`WE#X*Pb34tRT&&6=8s+&|v1W%Fh&yUV zr5A+*6b_a(cd}p}zaQ>Y)v2*H=ku#Ioss|tCdhav3IHl$CQkj+m+0-i7#Gg(B%6Q=@RS(Gg=ngS>r+9T2ahAp&Ea@o=FMYHTc z9~?zj`Vwbotc5YlWMF`O9+nx;Z1B6(v-Xx4Oq85Uy8Al&2YYPz2Doc;qPjyPa6#2dHNwon`>fm_i_QhOs5}Q0(nt9NSb=RA^*qZ~$BPfx&?g9%jjD%ixAX zcVqvFXIe$r&aSS|P#BM~im=^q0bq+5x`){xDW>6>*(1f6uFiq3P``M15w?F2v*m0t za(`$<%oL*r2F2lGOy|&0|9)|(7}*=@9}?55Lv+hi?_zGP{hv^EvtU>oqt4kO4vl7J z#M%V=gS+vh<>eV{yv8C=y00Bq=w~pl@B#(Q3>?dAClvCFYH010r|8AH%`ZW`>VgWh zZ{6l4K|PDEyH(GkRkc_ct-DRlN7(uBJiIOUGwTX7s5}ME6?Go3u4Jb3V%_`M=Ut6M zoLg|ddpb&Ux9%=A5@2D&HOaI-&M($=C^RfR%n^8U0RLzT>qW6nkHXc4l*{uW$2vX!RuK&sD+V?mHHdW~l`D*F0c}%_JVDRJ z-@09jVI>*VfCd@I%^0fDC66ctoHz+t?O_8l`57@DDV$JuUUC)ZMs^?TZ$z zk$J{N4!1_%u zG0(g#pi%ky?QCddEek(P!`&a5Wy>{fc?}e4Mx1DAKO|xVTkVfLlfQ0^)LpP*9hPXY@$hf?hhC=pG`L1rxw*QFU&h$e~95R z2=-o0+DkuPgLf~c6WBwuTVu(PJsim*m0p)%pr&d}lRzAv?ue#{sw6a>f;CW`W|U2g z~@@TDm zG;dY#0has3g-2`UQqf_0g~*o+HnIScMSar&`U z>RFjtu~}6r`I*O7aqci#FVjSp^T-a z%Sy{i$+JS2OJ=#U#k#9Z)%m8fzAEaZ;|AtX3rCh#g$s#RZ7l*b_kJtbR5eboNAq%!r_T*t~Hw5+}3vM!7cIy z(dg!uZOxJFnIWFfrWP=& zwF(RiE0zLEIy4JVmL*Zb)W*~S@^nN2q|uh|h!!yDw}rTxRSKY55*I+Vl3Rq7Z;39# z$t8nI2J__NwCAp{zT+-)wOGFWkNe*LIBxvkH35k9ea0bP|W1Vu~JE6 z4KHRFqVk!$^w=vO4^|xNU1H`V5Bpl;LFSDPhaUf-GKO>LaxU=*(efhvEN-wecutZ( zL1!f_LWacY4FXI!+zX47C(Ar98Hkb?DZj_zeAV1tHz5&2bQDwP*4 zbUTR_xkYP{A2Vpl!ZC(Js4ekvTlu;q50(r(5i5C2{GljBLR@4r8AVnZ2vSM$X05@6!OV(~^9ASNiB5kar3^%$M!-1o)o#1ANbdPBoBE zeq#uH{Js!jUMvIa|0lSOJig0u9zLFvz?qADy#EZh;p4jvVR&VTHGWj!9$|H9HI@X5T4O7w=SKuiNLva&a{2J+&Tx^I0Y*L zZJB~gWJsH(U}YF+n-q+Kx3mO8zH6mmj(9bW6->>k@v3093i=AhB`>!gA@bcK31ee}%Y5_5U0B&jH28Hv z6bKl5bI0YDZ)znbg^@D4+CC==L=H&+7If|2ojk zMSj{0+Erc_dNT7j`o=z1@V!U#zM?6wflYajI?6i)ezp(GWubj+gtYIxELeQXH!x>_ ze+!uJMDjB74Q%9p*CGE?;4}TpLjR&X19Rs2Dh27w=;KvKdh(xD-3T$I-}f9a=?hmt z%3px%e@}n3>!$x(Vww2QfSvmM31Fj73kNUW0Bqjhvs~|7`)9zWzY}Krnej-g!t%@& z+H;9)|7RVr8;UmLf!_>UsyhU23g?#w4V!Ps-KOC=grwh%@By?JFQy*`Z0bY!gPQ*w z=;S}B;qw~id!)RM;U@jlfKC78H^e>%*eUNTfSvjMxlYe6%JeU4__&5IYnXEf>F+E` z|DL8FKuCHyj5XVP4yKUbK;ySn%)W>4T5ZgY{H+=`->{>ejD6%c(FQdAw9cR3mNQon zks}&@8*%1;T*D_d{H%trYMAf4@-q7R9$;tt{RFV-FMf=_Hvl{J^>dy6JVNI88x22? zxU9dPgv>Ya>NR{`({})N=GUv~rhOmO@K(*wZ{hJW-^BZfhTDN-exKLySq=ZGh5?Eo z?iVzC9&z&jy@t&<@&3DpJJ5dXKwqZkI-^g)%@sFQc()Tif1C*~d_hjEkBId#5zXdv z`RTDSFxd9pUBh;N-$+<~b|{vy6RFH74wA>P#l;i+=^1QtC;6smJl3*(^Y+dBs?qN= z$uH8W4Vn#4Z+2Fw=kT%V$;nwHaX`}3Uc~Bj1KIYjVZ7C6hX%T3fmk{dkKw&N_2gdI z-TU$KUtgE7d-?}=;#~3Iu3b2XY==8{_J{B-CH1i-I85|`7sofI{_y9#5?m?HtpUU*XA_*RzcoNy4BPiL_y*j_oO)*Kc4fB8rltE?64$Wqo^ zxvOk)sIRPzsV{~(b5&m`b7HR7dVlC!Zi_zf=uqHwKPh+pZ@LwK3es5=rIO+=+Wjv| CEfl2y diff --git a/src/usr/lib/hildon-desktop/CallNotify.py b/src/usr/lib/hildon-desktop/CallNotify.py index 2838f51..d6c0c71 100755 --- a/src/usr/lib/hildon-desktop/CallNotify.py +++ b/src/usr/lib/hildon-desktop/CallNotify.py @@ -21,7 +21,7 @@ class CallNotify(hildondesktop.StatusMenuItem): self.msgType = "" self.toShow = True self.stop = False - self.path = "/home/user/.rtcom-eventlogger/el.db" + self.path = "/home/user/.rtcom-eventlogger/el-v1.db" self.missed = self.getMissedCallsCount(False) self.missedSMS = self.getMissedCallsCount(True) self.missedLastCall = self.missed @@ -301,6 +301,8 @@ class CallNotify(hildondesktop.StatusMenuItem): def handleMissedCall(self): self.dbg('handleMissedCall started') + #self.dbg('self.missedLastCall: ' + self.missedLastCall) + #self.dbg('self.getMissedCallsCount(False): ' + self.getMissedCallsCount(False)) if self.missedLastCall != self.getMissedCallsCount(False): if self.msgType == "SMS": self.msgType = "Both" @@ -336,13 +338,15 @@ class CallNotify(hildondesktop.StatusMenuItem): return True def getMissedCallsCount(self, isSms): - self.dbg('getMissedCallsCount started. agrs: ' + str(isSms)) - eType = 3 - if isSms: - eType=7 - conn = sqlite3.connect(self.path) - cur = conn.cursor() - cur.execute("select count(id) from Events where event_type_id = " + str(eType)) + self.dbg('getMissedCallsCount started. agrs: ' + str(isSms)) + conn = sqlite3.connect(self.path) + cur = conn.cursor() + if isSms: + #Nokia changed the event number from 7 to 11 and also combined the incomming and outgoing sms's + cur.execute("select count(id) from Events where event_type_id = 11 and outgoing = 0") + else: + #Nokia changed the event from 3 to 2 + cur.execute("select count(id) from Events where event_type_id = 2") return cur.fetchone()[0] def show(self): @@ -396,9 +400,9 @@ hd_plugin_type = CallNotify # Uncomment from "if __name__..." to "gtk.main()" if running from CLI as: # "run-standalone.sh python CallNotify.py" -#if __name__=="__main__": -# gobject.type_register(hd_plugin_type) -# obj = gobject.new(hd_plugin_type, plugin_id="plugid_id") -# obj.show_all() -# gtk.main() +if __name__=="__main__": + gobject.type_register(hd_plugin_type) + obj = gobject.new(hd_plugin_type, plugin_id="plugid_id") + obj.show_all() + gtk.main() diff --git a/src/usr/share/applications/hildon-control-panel/callnotify.desktop b/src/usr/share/applications/hildon-control-panel/callnotify.desktop old mode 100644 new mode 100755 index de789ec..b476a5a --- a/src/usr/share/applications/hildon-control-panel/callnotify.desktop +++ b/src/usr/share/applications/hildon-control-panel/callnotify.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Vrsion=1.0 +Version=1.0 Name=Call Notify Comment=Settings for Call Notify application Type=HildonControlPanelPlugin diff --git a/src/usr/share/applications/hildon-status-menu/CallNotify.desktop b/src/usr/share/applications/hildon-status-menu/CallNotify.desktop old mode 100644 new mode 100755 -- 1.7.9.5