X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=plugin.pyx;h=811adb7764ab798702902723e1b1b3ab5e8b8ca2;hp=f9b05d608eb6b3e050dc07bcf54d1ad4bff1dc95;hb=5fe506a5d23d5f7ba01599247a58bd03ca9eb7da;hpb=b8581ea44a2ad824d5d4f5f829855e1b67f48fa1;ds=sidebyside

diff --git a/plugin.pyx b/plugin.pyx
index f9b05d6..811adb7 100644
--- a/plugin.pyx
+++ b/plugin.pyx
@@ -24,9 +24,14 @@ cdef class Plugin:
     cdef prpl.PurplePluginProtocolInfo *c_prpl_info
     cdef plugin.PurplePluginInfo *c_plugin_info
 
+    def __init__(self):
+        pass
+
+    '''
     def __init__(self, id):
         self.c_plugin = plugin.c_purple_plugins_find_with_id(id)
         self.c_prpl_info = plugin.c_PURPLE_PLUGIN_PROTOCOL_INFO(self.c_plugin)
+    '''
 
     def get_name(self):
         return self.c_plugin.info.name
@@ -72,9 +77,6 @@ cdef class Plugin:
 
         if username:
             c_account = account.c_purple_accounts_find(username, id)
-            if c_account == NULL:
-                # FIXME: Message error or call a error handler
-                return None
 
         c_plugin = plugin.c_purple_plugins_find_with_id(id)
         c_prpl_info = plugin.c_PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)
@@ -91,7 +93,7 @@ cdef class Plugin:
             setting = accountopt.c_purple_account_option_get_setting(option)
 
             sett = str(<char *> setting)
-            label = str(<char *> lanel_name)
+            label = str(<char *> label_name)
 
             if type == prefs.PURPLE_PREF_STRING:
                 str_value = accountopt.c_purple_account_option_get_default_string(option)
@@ -132,7 +134,8 @@ cdef class Plugin:
 
         return po
 
-    def set_options(self, id, username, po):
+    def set_options(self, acc, po):
+        #FIXME: account
         ''' @param id The protocol's id '''
         ''' @param username The account's username '''
         ''' @param po Dictionary {'setting type': str|int|bool value, ...} '''
@@ -151,12 +154,12 @@ cdef class Plugin:
 
         c_account = NULL
 
-        c_account = account.c_purple_accounts_find(username, id)
+        c_account = account.c_purple_accounts_find(acc[0], acc[1])
         if c_account == NULL:
             # FIXME: Message error or call a error handler
             return False
 
-        c_plugin = plugin.c_purple_plugins_find_with_id(id)
+        c_plugin = plugin.c_purple_plugins_find_with_id(acc[1])
         c_prpl_info = plugin.c_PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)
 
         iter = c_prpl_info.protocol_options
@@ -171,7 +174,7 @@ cdef class Plugin:
 
             iter = iter.next
 
-            if not po.has_key(sett):
+            if not po.has_key(sett) or not po[sett]:
                 continue
 
             if type == prefs.PURPLE_PREF_STRING: