From 5f1088fe97ce236fcb720c47d4a1122cb9bca8ec Mon Sep 17 00:00:00 2001
From: Ragner Magalhaes <ragner.magalhaes@openbossa.org>
Date: Tue, 2 Dec 2008 21:19:08 +0000
Subject: [PATCH] Added {add,remove}_buddy and get_buddies_online.

FIXES:
 - Added {add,remove}_buddy and get_buddies_online on Account class.
 - Added exists property on Buddy class.
 - Removed new() methods from Buddy class.

Signed-off-by: Bruno Abinader <bruno.abinader@indt.org.br>
Signed-off-by: Ragner Magalhaes <ragner.magalhaes@indt.org.br>

git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1442 596f6dd7-e928-0410-a184-9e12fd12cf7e
---
 account.pyx |   93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 buddy.pyx   |   25 +++-------------
 2 files changed, 97 insertions(+), 21 deletions(-)

diff --git a/account.pyx b/account.pyx
index 9af451e..407dc4e 100644
--- a/account.pyx
+++ b/account.pyx
@@ -423,3 +423,96 @@ cdef class Account:
         else:
             return False
 
+    def add_buddy(self, name, alias=None, group=None):
+        """
+        Adds a buddy to account's buddy list.
+
+        @param name  Buddy name
+        @param alias Buddy alias (optional)
+        @return True if successfull, False otherwise
+        """
+        cdef blist.PurpleBuddy *c_buddy = NULL
+        cdef blist.PurpleGroup *c_group = NULL
+        cdef char *c_alias = NULL
+
+        if alias:
+            c_alias = alias
+        else:
+            c_alias = NULL
+
+        if self.__exists and \
+                account.purple_account_is_connected(self._get_structure()):
+            if blist.purple_find_buddy(self._get_structure(), name):
+                return False
+
+            if group:
+                c_group = blist.purple_find_group(group)
+                if c_group == NULL:
+                    c_group = blist.purple_group_new(group)
+
+            c_buddy = blist.purple_buddy_new(self._get_structure(), \
+                    name, c_alias)
+            if c_buddy == NULL:
+                return False
+
+            blist.purple_blist_add_buddy(c_buddy, NULL, c_group, NULL)
+            account.purple_account_add_buddy(self._get_structure(), c_buddy)
+            return True
+
+        else:
+            return None
+
+    def remove_buddy(self, name):
+        """
+        Removes a buddy from account's buddy list.
+
+        @param name Buddy name
+        @return True if successful, False otherwise
+        """
+        cdef blist.PurpleBuddy *c_buddy = NULL
+        cdef blist.PurpleGroup *c_group = NULL
+
+        if self.__exists and \
+                account.purple_account_is_connected(self._get_structure()):
+            c_buddy = blist.purple_find_buddy(self._get_structure(), name)
+            if c_buddy == NULL:
+                return False
+
+            c_group = blist.purple_buddy_get_group(c_buddy)
+
+            account.purple_account_remove_buddy(self._get_structure(), \
+                    c_buddy, c_group)
+            blist.purple_blist_remove_buddy(c_buddy)
+            return True
+        else:
+            return None
+
+    def get_buddies_online(self):
+        cdef glib.GSList *iter = NULL
+        cdef blist.PurpleBuddy *c_buddy = NULL
+        cdef char *c_alias = NULL
+
+        if self.__exists and \
+                account.purple_account_is_connected(self._get_structure()):
+            iter = blist.purple_find_buddies(self._get_structure(), NULL)
+
+            buddies_list = []
+            while iter:
+                c_alias = NULL
+                c_buddy = <blist.PurpleBuddy *> iter.data
+                if <blist.PurpleBuddy *> c_buddy and \
+                        status.purple_presence_is_online( \
+                                blist.purple_buddy_get_presence(c_buddy)):
+                    name = <char *> blist.purple_buddy_get_name(c_buddy)
+
+                    c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)
+                    if c_alias == NULL:
+                        alias = None
+                    else:
+                        alias = c_alias
+
+                    buddies_list.append((name, alias))
+                iter = iter.next
+            return buddies_list
+        else:
+            return None
diff --git a/buddy.pyx b/buddy.pyx
index 934ef68..9a4523a 100644
--- a/buddy.pyx
+++ b/buddy.pyx
@@ -44,6 +44,10 @@ cdef class Buddy:
                 self.__account.username, self.__account.protocol.id), \
                 self.__name)
 
+    def __get_exists(self):
+        return self.__exists
+    exists = property(__get_exists)
+
     def __get_name(self):
         if self.__exists:
             return <char *> blist.purple_buddy_get_name(self._get_structure())
@@ -121,24 +125,3 @@ cdef class Buddy:
         else:
             return None
     idle = property(__get_idle)
-
-    def new(self, alias=None):
-        """
-        Created a new buddy.
-
-        @param alias (optional)
-        @return True if successful, False if buddy already exists
-        """
-        cdef char *c_alias = NULL
-
-        if alias:
-            c_alias = alias
-        else:
-            c_alias = NULL
-
-        if self.__exists:
-            return False
-        else:
-            blist.purple_buddy_new(account.purple_accounts_find( \
-                    self.__account.username, self.__account.protocol.id), \
-                    self.__name, c_alias)
-- 
1.7.9.5