hamster-applet r692 - in trunk: . hamster

[pzawadzki svn gnome org]

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

Log:
Make it work with Unicode locales (at least assuming GTK+ always return UTF-8).


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

Modified: trunk/hamster/applet.py
==============================================================================
--- trunk/hamster/applet.py	(original)
+++ trunk/hamster/applet.py	Wed Feb  4 18:50:06 2009
@@ -592,7 +592,7 @@
 
     def on_activity_entered(self, component):
         """fires, when user writes activity by hand"""
-        activity_name = component.get_text()
+        activity_name = component.get_text().decode('utf8', 'replace')
         
         if activity_name == "":
             return

Modified: trunk/hamster/db.py
==============================================================================
--- trunk/hamster/db.py	(original)
+++ trunk/hamster/db.py	Wed Feb  4 18:50:06 2009
@@ -82,7 +82,7 @@
                    INSERT INTO categories (id, name, category_order)
                         VALUES (?, ?, ?)
         """
-        self.execute(query, (id, name.encode('utf-8'), order))
+        self.execute(query, (id, name, order))
         return id
 
     def __update_category(self, id,  name):
@@ -125,7 +125,8 @@
                         LIMIT 1
             """
             
-            res = self.fetchone(query, (name.encode('utf-8'), category_id))
+            print '!!!!!!!!!!! %s' % type(name)
+            res = self.fetchone(query, (name, category_id))
         else:
             query = """
                        SELECT id, deleted from activities 
@@ -133,8 +134,8 @@
                      ORDER BY deleted, id desc
                         LIMIT 1
             """
-            
-            res = self.fetchone(query, (name.encode('utf-8'), ))
+
+            res = self.fetchone(query, (name, ))
         
         if res:
             # if the activity was marked as deleted, ressurect on first call
@@ -161,7 +162,7 @@
                     LIMIT 1
         """
             
-        res = self.fetchone(query, (name.encode('utf-8'), ))
+        res = self.fetchone(query, (name, ))
         
         if res:
             return res['id']
@@ -448,7 +449,7 @@
                    INSERT INTO activities (id, name, category_id, activity_order)
                         VALUES (?, ?, ?, ?)
         """
-        self.execute(query, (new_id, name.encode('utf-8'), category_id, new_order))
+        self.execute(query, (new_id, name, category_id, new_order))
         return new_id
 
     def __update_activity(self, id, name, category_id):
@@ -458,7 +459,7 @@
                            category_id = ?
                      WHERE id = ?
         """
-        self.execute(query, (name.encode('utf-8'), category_id, id))
+        self.execute(query, (name, 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:50:06 2009
@@ -38,6 +38,7 @@
 name = os.path.join(os.path.dirname(__file__), '..')
 if _check(name):
     print 'Running uninstalled hamster, modifying PYTHONPATH'
+    sys.path.insert(0, '..')
     sys.path.insert(0, 'keybinder/.libs')
 
 # Now the path is set, import our applet