From e7c28c90e0ede65b6264178eb2918a85e8a472b5 Mon Sep 17 00:00:00 2001 From: kibergus Date: Thu, 18 Mar 2010 19:07:24 +0000 Subject: [PATCH] 0.1.7 release git-svn-id: file:///svnroot/ussd-widget/trunk@28 d197f4d6-dc93-42ad-8354-0da1f58e353f --- ussd-widget/build_ussd-widget.py | 4 +-- ussd-widget/po/ru.po | 37 ++++++++++---------- .../src/usr/lib/hildon-desktop/ussd-widget.py | 12 ++++++- .../usr/share/locale/ru/LC_MESSAGES/ussd-widget.mo | Bin 11097 -> 11177 bytes 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/ussd-widget/build_ussd-widget.py b/ussd-widget/build_ussd-widget.py index b6581e9..a74c843 100644 --- a/ussd-widget/build_ussd-widget.py +++ b/ussd-widget/build_ussd-widget.py @@ -34,9 +34,9 @@ if __name__ == "__main__": # p.postinstall="""#!/bin/sh #""" #Set here your post install script - version = "0.1.6" + version = "0.1.7" build = "0" - changeloginformation = "SMS listener. Changed parser sintax." + changeloginformation = "Bug fix release." dir_name = "src" diff --git a/ussd-widget/po/ru.po b/ussd-widget/po/ru.po index 1f95b1b..9c9df0c 100644 --- a/ussd-widget/po/ru.po +++ b/ussd-widget/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-13 12:04+0300\n" +"POT-Creation-Date: 2010-03-18 21:58+0300\n" "PO-Revision-Date: 2010-01-29 17:51+0300\n" "Last-Translator: Alexey Guseunov \n" "Language-Team: Russian\n" @@ -14,67 +14,67 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: utf-8\n" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "German" msgstr "Немецкий" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "English" msgstr "Английский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Italian" msgstr "Итальянский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "French" msgstr "Французский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Spanish" msgstr "Испанский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Dutch" msgstr "Голандский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Swedish" msgstr "Шведский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Danish" msgstr "Датский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Portuguese" msgstr "Португальский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Finnish" msgstr "Финский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Norwegian" msgstr "Норвежский" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Greek" msgstr "Греческий" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Turkish" msgstr "Турецкий" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Reserved1" msgstr "Зарезервирован1" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Reserved2" msgstr "Зарезервирован2" -#: src/usr/lib/hildon-desktop/ussd-widget.py:29 +#: src/usr/lib/hildon-desktop/ussd-widget.py:30 msgid "Unspecified" msgstr "Не указан" @@ -263,7 +263,7 @@ msgstr "Дополнительные опции для ussdquery.py" #: src/usr/lib/hildon-desktop/ussd-widget.py:718 msgid "Enable SMS listener." -msgstr "" +msgstr "Включить обработку СМС" #: src/usr/lib/hildon-desktop/ussd-widget.py:726 msgid "SMS number" @@ -427,4 +427,3 @@ msgstr "Выберите цвет текста" #: src/usr/lib/hildon-desktop/ussd-widget.py:827 msgid "Choose a font" msgstr "Выберите шрифт" - diff --git a/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py b/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py index 79c92d3..3fbe088 100755 --- a/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py +++ b/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py @@ -14,6 +14,7 @@ import fcntl import dbus import subprocess import gsmdecode +import sys from dbus.mainloop.glib import DBusGMainLoop try : @@ -876,6 +877,7 @@ def smart_split_string (str, reply1, reply2, reres1 = None, reres2 = None) : word += reply1 ws = 0 num = -1 + subst = '' # Delete backslash if it delimites usual numbers from % or & if str[i] == '\\' and i < len(str)-1 and str[i+1] in ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] : continue @@ -1075,8 +1077,16 @@ hd_plugin_type = UssdWidgetPlugin # The code below is just for testing purposes. # It allows to run the widget as a standalone process. if __name__ == "__main__": + plugin_id = "ussd-widget.console" + if len(sys.argv) == 2: + try: + plugin_id = "ussd-widget.desktop-"+str(int(sys.argv[1])) + except: + print "Plugin id must be integer" + sys.exit(-1) + import gobject gobject.type_register(hd_plugin_type) - obj = gobject.new(hd_plugin_type, plugin_id="plugin_id") + obj = gobject.new(hd_plugin_type, plugin_id=plugin_id) obj.show_all() gtk.main() diff --git a/ussd-widget/src/usr/share/locale/ru/LC_MESSAGES/ussd-widget.mo b/ussd-widget/src/usr/share/locale/ru/LC_MESSAGES/ussd-widget.mo index 1c929efff3fe6a03cec9e97e1b23bb825f94ff6c..09a2f1696a4c9e8291bc84045fb1d1029ae5a05b 100644 GIT binary patch delta 1726 zcmYk+YfQ~?9LMo**V9GRq1;l(C5eiYTcskG5_v$0p721Y$)zEqne9lPxNbCe+L#$O z!*aLr#A8m+P!3OcWMj<3n)m1b|F`+=eE+ZC|Mt6mfB*Bb>F%a*)E|G|DD^}(aX8j2 zgoE)MD0>pka&a%F<5^6=o0x`oa6CT6419-U@GFkOU#ND6a2!tZx#x3nidop|sT6W! z2l9+vM0L=Mdf^sk;S1zv5e~Zl0T*Kwt1&CdtQ0q6EuO^+{D_shpX|2Nh`eGuF`oXd zgGwqFI#B~S=6Mp;(K*jc=;yo_8M!^eOni@8fp4gWhcE>bIA{^mkxQ28nTss46<`Ma zTOpOtScUv7o6*R89E&BWj%)Bhj9D{2#0cvvyGFYml#m~FRDnuO4VGaes=YI)0bNE7 zv=_roRBn40hENYCkVrj{?l}SJ(*hX8Le#*wpavL4-T&=5jLLlqqgFfPJ#%p?=lR}w zou6ic%wRnimT;q+)_B+6pq98FC*x0?hN*0bnOKaB)iz=tw&Dgng{$z3cb-RnLY#Nv zQj8*tWjSmp96`e=THp{dj3Ie+7!OA zT+BetEQs17xtV}>NqO3Dq{&2)co{sRYVEFiaXycIA4RT*TE}A zp6ofNFfn7lIkTUJWWZSg<(q9`ESyvH&95ew5-W*vVhy2H3TxA71F4W^C$}q5pHVTP zf3`wmq%5aWO$3RVgi@AD=<69N+Mw(+TSP1-DhQP%BH5|Ao7AdX`nDyO#-uf@YY6OW z>)0P^5A7@N>+yY0@s$Qjg5?WK`;Pb@#P!U|OiPWt?C%alZbYs{ZuDhmRc8JJDfXEM delta 1674 zcmYk+Nk~;u9LMp$Lq3O0bGC9y%`(feK{HD$HN_Sh1?Plm$%?)h-Ik zsOTl7i?C%;&?ZPiu|+{h&_tGP`u^@cMTd9Z=bZEIJJbK1du!+Tj^JccLO{ZVE)cmNY|0O#O&jK|BEjyG{WKEVWhg>!KV)$b=v!PtOb&%rFSpw&_+ z;fGzwGjS6Rt*0a0K=HOXoN$=I>Gces#`b9`$fmqxJ$U zX8|QibhnO%z4XR2b_KP?cW@y-$Hn*omtYJhh`Cr97GgcNV>fQWQCC-dI;nTy1{^^) z%YGq`STqNs3bWE!jvCr&(9FB>1oq(toWV1Anm}L0%nY-0IE-p<%H-hTYt#TS3;dnT zKutU!>B1UO6W@ah=@Ha;13?P;6wYE7KES1z$?~^i1FC~T=XKO!9mO1cidw)s)ZzMp z#rO*!v&9A6J-W0BwpIQ7#O;`nZB~TAgA@k%=O89TunGc|h}i{xC`x%sA!)-hJcP&b z8Y*O|%vLKZa@OE5^)}RsBbNEMB?YxZ#i;gbW!)k3ylRPV*{1B