psa: fixed configdir value

[feedingit] / psa_harmattan / feedingit / deb_dist / feedingit-0.1.0 / debian / feedingit / usr / share / feedingit / feedingit.py

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py
index d2060e8..9755a3d 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py
@@ -8,13 +8,15 @@ import os
 from os import mkdir, remove, stat, environ
 from os.path import isfile, isdir, exists
 import codecs
-from gconf import client_get_default
+import dbus
+# import python dbus GLib mainloop support
+import dbus.mainloop.glib
 
 # Comment the line below if you don't want to use OpenGL for QML rendering or if it is not supported
 from PySide import QtOpenGL,  QtCore
 
 from rss_sqlite import Listing
-CONFIGDIR = environ.get("HOME", "/home/user") + "/.feedingit"
+CONFIGDIR = environ.get("HOME", "/home/user") + "/.feedingit/"
 #CONFIGDIR = "/home/user/.feedingit"
 
 import logging
@@ -32,6 +34,18 @@ class Controller(QtCore.QObject):
         QtCore.QObject.__init__(self)
         from XmlHandler import XmlHandler
         self._handler = XmlHandler(listing)
+        
+    def update_progress(self, percent_complete,
+                        completed, in_progress, queued,
+                        bytes_downloaded, bytes_updated, bytes_per_second,
+                        feed_updated):
+        pass
+    
+    def update_started(self):
+        root.updateStarted()
+    
+    def update_finished(self):
+        root.updateFinished()
 
     @QtCore.Slot(str,str, result=str)
     def getArticle(self, key, article):
@@ -155,6 +169,8 @@ class Controller(QtCore.QObject):
             return config.getHideReadFeeds()
         elif (setting == "hideReadArticles"):
             return config.getHideReadArticles()
+        elif (setting == "autoupdate"):
+            return config.isAutoUpdateEnabled()
         else:
             return 'True'
         
@@ -168,6 +184,8 @@ class Controller(QtCore.QObject):
             config.setHideReadFeeds(value)
         elif (setting == "hideReadArticles"):
             config.setHideReadArticles(value)
+        elif (setting == "autoupdate"):
+            config.setAutoUpdateEnabled(value)
         config.saveConfig()
 
 def main():
@@ -198,6 +216,25 @@ def main():
 
     controller = Controller(listing)
  
+    # listen on dbus for download update progress
+    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+    bus = dbus.SessionBus()
+#        bus.add_signal_receiver(handler_function=self.update_progress,
+#                                bus_name=None,
+#                                signal_name='UpdateProgress',
+#                                dbus_interface='org.marcoz.feedingit',
+#                                path='/org/marcoz/feedingit/update')
+#    bus.add_signal_receiver(handler_function=controller.update_started,
+#                            bus_name=None,
+#                            signal_name='UpdateStarted',
+#                            dbus_interface='org.marcoz.feedingit',
+#                            path='/org/marcoz/feedingit/update')
+#    bus.add_signal_receiver(handler_function=controller.update_finished,
+#                            bus_name=None,
+#                            signal_name='UpdateFinished',
+#                            dbus_interface='org.marcoz.feedingit',
+#                            path='/org/marcoz/feedingit/update')
+ 
     global root
     rc = view.rootContext()