No more sudo and no more iconv

git-svn-id: file:///svnroot/ussd-widget/trunk@3 d197f4d6-dc93-42ad-8354-0da1f58e353f

diff --git a/ussd-common/build_ussd-common.py b/ussd-common/build_ussd-common.py
index 8260066..1fac39e 100644 (file)
--- a/ussd-common/build_ussd-common.py
+++ b/ussd-common/build_ussd-common.py
@@ -24,7 +24,7 @@ if __name__ == "__main__":
     p.author="Alexey Guseynov"
     p.mail="kibergus@gmail.com"
     p.depends = "python2.5, pexpect"
-    p.section="user/utilities"
+    p.section="misc"
     p.icon = "./ussd-widget.png"
     p.arch="all"                #should be all for python, any for all arch
     p.urgency="low"             #not used in maemo onl for deb os
@@ -39,7 +39,7 @@ chmod +s /usr/bin/pnatd
 """ #Set here your post install script
 
     version = "0.0.0"
-    build = "1" 
+    build = "2" 
     changeloginformation = "First release" 
    
     dir_name = "src"     

diff --git a/ussd-common/src/usr/bin/ussdquery.py b/ussd-common/src/usr/bin/ussdquery.py
index c67de52..51fa6f0 100755 (executable)
--- a/ussd-common/src/usr/bin/ussdquery.py
+++ b/ussd-common/src/usr/bin/ussdquery.py
@@ -43,8 +43,7 @@ if encoding == '86':
     reply = reply.decode("hex")
 elif encoding == '72':
     reply = reply.decode("hex")
-    p = Popen(['iconv', '-f', 'UCS-2BE', '-t', 'UTF8'], stdin=PIPE, stdout=PIPE);
-    reply = p.communicate(reply)[0]
+    reply = reply.decode("UTF-16 BE")
 
 print reply;
 

diff --git a/ussd-widget/build_ussd-widget.py b/ussd-widget/build_ussd-widget.py
index f0af40d..e845f86 100644 (file)
--- a/ussd-widget/build_ussd-widget.py
+++ b/ussd-widget/build_ussd-widget.py
@@ -35,7 +35,7 @@ if __name__ == "__main__":
 #""" #Set here your post install script
 
     version = "0.0.0"
-    build = "2" 
+    build = "3" 
     changeloginformation = "Splitted packages" 
    
     dir_name = "src"     

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 ae5a7a1..8f20617 100755 (executable)
--- a/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py
+++ b/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py
@@ -8,9 +8,9 @@ from subprocess import *
 
 class UssdConfigDialog(gtk.Dialog):
     def __init__(self, queryNumber):
-        gtk.Dialog.__init__(self, "Hello World", None,
+        gtk.Dialog.__init__(self, "USSD widget", None,
                             gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR,
-                            ("Close", gtk.RESPONSE_OK))
+                            ("Save", gtk.RESPONSE_OK))
         self.ussdNumber = hildon.Entry(gtk.HILDON_SIZE_AUTO)
         self.ussdNumber.set_text(queryNumber)
         self.vbox.add(gtk.Label("USSD number"))
@@ -32,7 +32,7 @@ def get_ussd_number():
 def ussd_renew(button):
     query = get_ussd_number()
     if query :
-        p = Popen(['sudo', 'python', '/usr/bin/ussdquery.py', query], stdout=PIPE)
+        p = Popen(['python', '/usr/bin/ussdquery.py', query], stdout=PIPE)
         reply = p.communicate()[0].strip()
         if reply == "" :
             reply = "   Error   "
@@ -53,20 +53,25 @@ def on_show_settings(widget):
     config.close()
 
     dialog.destroy()
+    
+    if queryNumber == "" :
+        widget.button.set_label("Click to update")
 
 class UssdWidgetPlugin(hildondesktop.HomePluginItem):
     def __init__(self):
         hildondesktop.HomePluginItem.__init__(self)
-        button = gtk.Button("   Error   ")
-        button.connect("clicked", ussd_renew)
-        button.show_all()
-        self.add(button)
+        query = get_ussd_number()
+        if query :
+            self.button = gtk.Button("Click to update")
+        else :
+            self.button = gtk.Button("Configure me")
+        self.button.connect("clicked", ussd_renew)
+        self.button.show_all()
+        self.add(self.button)
 
         self.set_settings(True)
         self.connect("show-settings", on_show_settings)    
 
-        ussd_renew(button)
-
 hd_plugin_type = UssdWidgetPlugin
 
 # The code below is just for testing purposes.