Fix for accountopt, cosmetics and fix for union definition.

[python-purple] / account.pyx

diff --git a/account.pyx b/account.pyx
index 80b0b0e..1ae9d40 100644 (file)
--- a/account.pyx
+++ b/account.pyx
@@ -86,7 +86,7 @@ cdef class Account:
     def get_protocol_options(self):
         ''' FIXME: It is just a hack, to set the XMPP's options. '''
         cdef glib.GList *iter
     def get_protocol_options(self):
         ''' FIXME: It is just a hack, to set the XMPP's options. '''
         cdef glib.GList *iter

-        cdef account.PurpleAccountOption *option
+        cdef accountopt.PurpleAccountOption *option

         cdef prefs.PurplePrefType type
         cdef const_char *label_name
         cdef const_char *str_value
         cdef prefs.PurplePrefType type
         cdef const_char *label_name
         cdef const_char *str_value

@@ -95,12 +95,12 @@ cdef class Account:
         cdef glib.gboolean bool_value
         iter = self.c_prpl_info.protocol_options
         while iter:
         cdef glib.gboolean bool_value
         iter = self.c_prpl_info.protocol_options
         while iter:

-            option = <account.PurpleAccountOption *> iter.data
-            type = account.c_purple_account_option_get_type(option)
-            label_name = account.c_purple_account_option_get_text(option)
-            setting = account.c_purple_account_option_get_setting(option)
+            option = <accountopt.PurpleAccountOption *> iter.data
+            type = accountopt.c_purple_account_option_get_type(option)
+            label_name = accountopt.c_purple_account_option_get_text(option)
+            setting = accountopt.c_purple_account_option_get_setting(option)

             if type == prefs.PURPLE_PREF_STRING:
             if type == prefs.PURPLE_PREF_STRING:

-                str_value = account.c_purple_account_option_get_default_string(option)
+                str_value = accountopt.c_purple_account_option_get_default_string(option)

 
                 # Google Talk default domain hackery!
                 if str_value == NULL and str(<char *> label_name) == "Connect server":
 
                 # Google Talk default domain hackery!
                 if str_value == NULL and str(<char *> label_name) == "Connect server":

@@ -111,21 +111,21 @@ cdef class Account:
                     account.c_purple_account_set_string(self.__account, setting, str_value );
 
             elif type == prefs.PURPLE_PREF_INT:
                     account.c_purple_account_set_string(self.__account, setting, str_value );
 
             elif type == prefs.PURPLE_PREF_INT:

-                int_value = account.c_purple_account_option_get_default_int(option)
+                int_value = accountopt.c_purple_account_option_get_default_int(option)

                 if self.__account != NULL:
                    int_value = account.c_purple_account_get_int(self.__account, setting, int_value)
                    if str(<char *> setting) == "port":
                         account.c_purple_account_set_int(self.__account, setting, 443);
 
             elif type == prefs.PURPLE_PREF_BOOLEAN:
                 if self.__account != NULL:
                    int_value = account.c_purple_account_get_int(self.__account, setting, int_value)
                    if str(<char *> setting) == "port":
                         account.c_purple_account_set_int(self.__account, setting, 443);
 
             elif type == prefs.PURPLE_PREF_BOOLEAN:

-                bool_value = account.c_purple_account_option_get_default_bool(option)
+                bool_value = accountopt.c_purple_account_option_get_default_bool(option)

                 if self.__account != NULL:
                     bool_value = account.c_purple_account_get_bool(self.__account, setting, bool_value)
                     if str(<char *> setting) == "old_ssl":
                         account.c_purple_account_set_bool(self.__account, setting, True);
 
             elif type == prefs.PURPLE_PREF_STRING_LIST:
                 if self.__account != NULL:
                     bool_value = account.c_purple_account_get_bool(self.__account, setting, bool_value)
                     if str(<char *> setting) == "old_ssl":
                         account.c_purple_account_set_bool(self.__account, setting, True);
 
             elif type == prefs.PURPLE_PREF_STRING_LIST:

-                str_value = account.c_purple_account_option_get_default_list_value(option)
+                str_value = accountopt.c_purple_account_option_get_default_list_value(option)

                 if self.__account != NULL:
                     str_value = account.c_purple_account_get_string(self.__account, setting, str_value)
 
                 if self.__account != NULL:
                     str_value = account.c_purple_account_get_string(self.__account, setting, str_value)