hamster-applet r688 - in trunk: . hamster

[pzawadzki svn gnome org]

Author: pzawadzki
Date: Wed Feb  4 18:26:07 2009
New Revision: 688
URL: http://svn.gnome.org/viewvc/hamster-applet?rev=688&view=rev

Log:
Drop the unholy arcane magic modifying the path and importing process.


Removed:
   trunk/hamster/ltihooks.py
Modified:
   trunk/ChangeLog
   trunk/hamster/db.py
   trunk/hamster/hamster-applet.py

Modified: trunk/hamster/db.py
==============================================================================
--- trunk/hamster/db.py	(original)
+++ trunk/hamster/db.py	Wed Feb  4 18:26:07 2009
@@ -82,7 +82,7 @@
                    INSERT INTO categories (id, name, category_order)
                         VALUES (?, ?, ?)
         """
-        self.execute(query, (id, name, order))
+        self.execute(query, (id, name.encode('utf-8'), order))
         return id
 
     def __update_category(self, id,  name):
@@ -125,7 +125,7 @@
                         LIMIT 1
             """
             
-            res = self.fetchone(query, (name, category_id))
+            res = self.fetchone(query, (name.encode('utf-8'), category_id))
         else:
             query = """
                        SELECT id, deleted from activities 
@@ -134,7 +134,7 @@
                         LIMIT 1
             """
             
-            res = self.fetchone(query, (name,))
+            res = self.fetchone(query, (name.encode('utf-8'), ))
         
         if res:
             # if the activity was marked as deleted, ressurect on first call
@@ -161,7 +161,7 @@
                     LIMIT 1
         """
             
-        res = self.fetchone(query, (name, ))
+        res = self.fetchone(query, (name.encode('utf-8'), ))
         
         if res:
             return res['id']
@@ -178,7 +178,7 @@
                 LEFT JOIN activities b ON a.activity_id = b.id
                     WHERE a.id = ? 
         """
-        return self.fetchone(query, (id,))
+        return self.fetchone(query, (id, ))
 
     def __get_last_activity(self):
         query = """
@@ -448,7 +448,7 @@
                    INSERT INTO activities (id, name, category_id, activity_order)
                         VALUES (?, ?, ?, ?)
         """
-        self.execute(query, (new_id, name, category_id, new_order))
+        self.execute(query, (new_id, name.encode('utf-8'), category_id, new_order))
         return new_id
 
     def __update_activity(self, id, name, category_id):
@@ -458,7 +458,7 @@
                            category_id = ?
                      WHERE id = ?
         """
-        self.execute(query, (name, category_id, id))
+        self.execute(query, (name.encode('utf-8'), category_id, id))
 
     """ Here be dragons (lame connection/cursor wrappers) """
     def get_connection(self):

Modified: trunk/hamster/hamster-applet.py
==============================================================================
--- trunk/hamster/hamster-applet.py	(original)
+++ trunk/hamster/hamster-applet.py	Wed Feb  4 18:26:07 2009
@@ -34,13 +34,9 @@
 def _check(path):
     return exists(path) and isdir(path) and isfile(path+"/AUTHORS")
 
-name = join(dirname(__file__), '..')
 if _check(name):
     print 'Running uninstalled hamster, modifying PYTHONPATH'
-    sys.path.insert(0, abspath(name))
-else:
-    sys.path.insert(0, abspath("@PYTHONDIR@"))
-    print "Running installed hamster, using [ PYTHONDIR@:$PYTHONPATH]"
+    sys.path.insert(0, 'keybinder/.libs')
 
 # Now the path is set, import our applet
 import hamster.defs