X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=f70873ed9e9e223a26c07b635cc2080231f8ed68;hp=427d2bdebf24c469303a3c38e854dbb5e4156c46;hb=b3367928bdc3dca91ba80f103bef52617eb6b899;hpb=b81a85360c67a5721e59458aeec5d7b9280a290e

diff --git a/account.pyx b/account.pyx
index 427d2bd..f70873e 100644
--- a/account.pyx
+++ b/account.pyx
@@ -95,7 +95,7 @@ cdef class Account:
 
     def _get_protocol_options(self):
         """
-        @return Dictionary {'setting': value, ...} 
+        @return Dictionary {'setting': value, ...}
         """
         cdef glib.GList *iter
         cdef account.PurpleAccount *c_account
@@ -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)
@@ -221,6 +222,50 @@ cdef class Account:
             return None
     enabled = property(__get_enabled)
 
+    def __get_status_types(self):
+        cdef glib.GList *iter = NULL
+        cdef status.PurpleStatusType *c_statustype = NULL
+        cdef char *id = NULL
+        cdef char *name = NULL
+
+        if self.__exists:
+            status_types = []
+            iter = account.purple_account_get_status_types(self._get_structure())
+            while iter:
+                c_statustype = <status.PurpleStatusType *> iter.data
+                id = <char *> status.purple_status_type_get_id(c_statustype)
+                name = <char *> status.purple_status_type_get_name(c_statustype)
+                status_types.append((id, name))
+                iter = iter.next
+            return status_types
+        else:
+             return None
+
+    status_types = property(__get_status_types)
+
+    def __get_active_status(self):
+        cdef status.PurpleStatus* c_status = NULL
+        cdef char *type = NULL
+        cdef char *name = NULL
+        cdef char *msg = NULL
+        if self.__exists:
+            active = {}
+            c_status = <status.PurpleStatus*> account.purple_account_get_active_status(self._get_structure())
+            type = <char *> status.purple_status_get_id(c_status)
+            name = <char *> status.purple_status_get_name(c_status)
+            msg = <char *> status.purple_status_get_attr_string(c_status,
+                "message")
+
+            active['type'] = type
+            active['name'] = name
+            if msg:
+                active['message'] = msg
+
+            return active
+        else:
+            return None
+    active_status = property(__get_active_status)
+
     def set_username(self, username):
         """
         Sets the account's username.
@@ -391,27 +436,24 @@ 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_account(self, username, protocol_id):
-		"""
-        Removes as existing account.
 
-        @return True if successful, False if account doesnt exists
+    def remove(self):
         """
-		who = account.purple_accounts_find(username, protocol_id)
-		
-		if who == NULL:
-			return False
-		else
-			account.purple_accounts_remove( who )
-			return True
+        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):
         """
@@ -471,6 +513,10 @@ cdef class Account:
 
             blist.purple_blist_add_buddy(c_buddy, NULL, c_group, NULL)
             account.purple_account_add_buddy(self._get_structure(), c_buddy)
+            if c_alias:
+                blist.purple_blist_alias_buddy(c_buddy, c_alias)
+                server.serv_alias_buddy(c_buddy)
+
             return True
 
         else:
@@ -530,3 +576,37 @@ 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)
+
+    def set_active_status(self, type, msg=None):
+        cdef status.PurpleStatusType *c_statustype = NULL
+
+        if self.__exists:
+            if msg:
+                account.purple_account_set_status(self._get_structure(),
+                        <char *> type, True, "message", <char *> msg, NULL)
+            else:
+                account.purple_account_set_status(self._get_structure(),
+                        <char *> type, True, NULL)
+            return True
+        else:
+            return False
+
+    def set_status_message(self, type, msg):
+        cdef status.PurpleStatus* c_status = NULL
+        cdef status.PurpleStatusType *c_statustype = NULL
+
+        if self.__exists and msg:
+            c_status = account.purple_account_get_status(self._get_structure(),
+                    type)
+            status.purple_status_set_attr_string(c_status, "message", msg)
+            return True
+        else:
+            return False