Updated nullclient.py
[python-purple] / plugin.pyx
index c2b6538..c5b5f93 100644 (file)
@@ -29,7 +29,7 @@ cdef class Plugin:
 
     '''
     def __init__(self, id):
-        self.c_plugin = plugin.c_purple_plugins_find_with_id(id)
+        self.c_plugin = plugin.purple_plugins_find_with_id(id)
         self.c_prpl_info = plugin.c_PURPLE_PLUGIN_PROTOCOL_INFO(self.c_plugin)
     '''
 
@@ -47,7 +47,7 @@ cdef class Plugin:
 
         protocols = []
 
-        iter = plugin.c_purple_plugins_get_protocols()
+        iter = plugin.purple_plugins_get_protocols()
         while iter:
             pp = <plugin.PurplePlugin*> iter.data
             if pp.info and pp.info.name:
@@ -78,7 +78,7 @@ cdef class Plugin:
         if username:
             c_account = account.purple_accounts_find(username, id)
 
-        c_plugin = plugin.c_purple_plugins_find_with_id(id)
+        c_plugin = plugin.purple_plugins_find_with_id(id)
         c_prpl_info = plugin.c_PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)
 
         po = {}
@@ -97,9 +97,6 @@ cdef class Plugin:
 
             if type == prefs.PURPLE_PREF_STRING:
                 str_value = accountopt.purple_account_option_get_default_string(option)
-                # Google Talk default domain hackery!
-                if str_value == NULL and label == "Connect server":
-                    str_value = "talk.google.com"
                 if c_account != NULL:
                     str_value = account.purple_account_get_string(c_account, setting, str_value)
 
@@ -107,8 +104,6 @@ cdef class Plugin:
 
             elif type == prefs.PURPLE_PREF_INT:
                 int_value = accountopt.purple_account_option_get_default_int(option)
-                if sett == "port":
-                        int_value = int(443)
                 if c_account != NULL:
                     int_value = account.purple_account_get_int(c_account, setting, int_value)
 
@@ -159,7 +154,7 @@ cdef class Plugin:
             # FIXME: Message error or call a error handler
             return False
 
-        c_plugin = plugin.c_purple_plugins_find_with_id(acc[1])
+        c_plugin = plugin.purple_plugins_find_with_id(acc[1])
         c_prpl_info = plugin.c_PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)
 
         iter = c_prpl_info.protocol_options
@@ -213,7 +208,7 @@ cdef class Plugins:
         cdef glib.GList *iter
         cdef plugin.PurplePlugin *pp
         protocols = []
-        iter = plugin.c_purple_plugins_get_protocols()
+        iter = plugin.purple_plugins_get_protocols()
         while iter:
             pp = <plugin.PurplePlugin*> iter.data
             if pp.info and pp.info.name: