Updated report_disconnect_reason callback.

[python-purple] / account.pyx

diff --git a/account.pyx b/account.pyx
index 0ae93fd..db56e2c 100644 (file)
--- a/account.pyx
+++ b/account.pyx
@@ -133,9 +133,10 @@ cdef class Account:
 
                 str_value = <char *> accountopt.purple_account_option_get_default_string(option)
 
-                # Google Talk default domain hackery!
-                if str_value == NULL and str(<char *> label_name) == "Connect server":
-                    str_value = "talk.google.com"
+                # Hack to set string "" as default value to Account options when
+                # the default value of the protocol is NULL
+                if str_value == NULL:
+                    str_value = ""
                 str_value = <char *> account.purple_account_get_string(c_account, setting, str_value)
 
                 val = str(<char *> str_value)
@@ -396,20 +397,19 @@ cdef class Account:
 
             self.__exists = True
             return True
-       
-       def remove(self):
-               """
-        Removes as existing account.
 
-        @return True if successful, False if account doesnt exists
+    def remove(self):
         """
-               if self.__exists:
-                       account.purple_accounts_remove(self._get_structure())
-                       
-                       self__exists = False
-                       return True
-               else:
-                       return False
+        Removes an existing account.
+
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_accounts_delete(self._get_structure())
+            self__exists = False
+            return True
+        else:
+            return False
 
     def connect(self):
         """
@@ -528,3 +528,11 @@ cdef class Account:
             return buddies_list
         else:
             return None
+
+    def request_add_buddy(self, buddy_username, buddy_alias):
+        if buddy_alias:
+            blist.purple_blist_request_add_buddy(self._get_structure(), \
+                    buddy_username, NULL, buddy_alias)
+        else:
+            blist.purple_blist_request_add_buddy(self._get_structure(), \
+                    buddy_username, NULL, NULL)