Passing flags to write_im callback

[python-purple] / account.pyx

diff --git a/account.pyx b/account.pyx
index 407dc4e..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)
@@ -391,14 +392,25 @@ cdef class Account:
         if self.__exists:
             return False
         else:
-            # FIXME: Using purple_accounts_add(...) to save to xml
-            #   I think we could improve this ..
             account.purple_accounts_add(account.purple_account_new( \
                     self.__username, self.__protocol.id))
 
             self.__exists = True
             return True
 
+    def remove(self):
+        """
+        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):
         """
         Connects to an account.
@@ -505,14 +517,22 @@ cdef class Account:
                                 blist.purple_buddy_get_presence(c_buddy)):
                     name = <char *> blist.purple_buddy_get_name(c_buddy)
 
+                    new_buddy = Buddy(name, self)
+
                     c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)
-                    if c_alias == NULL:
-                        alias = None
-                    else:
-                        alias = c_alias
+                    if c_alias:
+                        new_buddy.set_alias(c_alias)
 
-                    buddies_list.append((name, alias))
+                    buddies_list.append(new_buddy)
                 iter = iter.next
             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)