Replacing None type by null list - purple.c

Function that returns lists now returning null list instead None type
    to prevent "TypeError: 'NoneType' object is not interable" in
    "for loop"

 Signed-off-by: Ragner Magalhaes <agner.magalhaes@openbossa.org>
 Acked-by: Ricardo Guimaraes <ricardo.guimaraes@openbossa.org>

git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1702 596f6dd7-e928-0410-a184-9e12fd12cf7e

diff --git a/purple.c b/purple.c
index e84adf5..e8c2ce9 100644 (file)
--- a/purple.c
+++ b/purple.c
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.8 on Wed Dec 10 14:36:50 2008 */
+/* Generated by Cython 0.9.8 on Fri Dec 12 10:07:08 2008 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -15400,8 +15400,8 @@ static PyObject *__pyx_pf_6purple_7Account___get_status_types(PyObject *__pyx_v_
   char *__pyx_v_name;
   PyObject *__pyx_v_status_types;
   PyObject *__pyx_r;
-  int __pyx_1;
-  PyObject *__pyx_2 = 0;
+  PyObject *__pyx_1 = 0;
+  int __pyx_2;
   PyObject *__pyx_3 = 0;
   PyObject *__pyx_4 = 0;
   __pyx_v_status_types = Py_None; Py_INCREF(Py_None);
@@ -15441,7 +15441,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_status_types(PyObject *__pyx_v_
  *         cdef char *id = NULL
  *         cdef char *name = NULL             # <<<<<<<<<<<<<<
  * 
- *         if self.__exists:
+ *         status_types = []
  */
   __pyx_v_name = NULL;
 
@@ -15449,28 +15449,28 @@ static PyObject *__pyx_pf_6purple_7Account___get_status_types(PyObject *__pyx_v_
   /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":231
  *         cdef char *name = NULL
  * 
- *         if self.__exists:             # <<<<<<<<<<<<<<
- *             status_types = []
+ *         status_types = []             # <<<<<<<<<<<<<<
+ *         if self.__exists:
  *             iter = account.purple_account_get_status_types(self._get_structure())
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  if (__pyx_1) {
+  __pyx_1 = PyList_New(0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(__pyx_v_status_types);
+  __pyx_v_status_types = ((PyObject *)__pyx_1);
+  __pyx_1 = 0;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":232
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":232
  * 
- *         if self.__exists:
- *             status_types = []             # <<<<<<<<<<<<<<
+ *         status_types = []
+ *         if self.__exists:             # <<<<<<<<<<<<<<
  *             iter = account.purple_account_get_status_types(self._get_structure())
  *             while iter:
  */
-    __pyx_2 = PyList_New(0); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    Py_DECREF(__pyx_v_status_types);
-    __pyx_v_status_types = ((PyObject *)__pyx_2);
-    __pyx_2 = 0;
+  __pyx_2 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  if (__pyx_2) {
 
     /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":233
+ *         status_types = []
  *         if self.__exists:
- *             status_types = []
  *             iter = account.purple_account_get_status_types(self._get_structure())             # <<<<<<<<<<<<<<
  *             while iter:
  *                 c_statustype = <status.PurpleStatusType *> iter.data
@@ -15478,15 +15478,15 @@ static PyObject *__pyx_pf_6purple_7Account___get_status_types(PyObject *__pyx_v_
     __pyx_v_iter = purple_account_get_status_types(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)));
 
     /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":234
- *             status_types = []
+ *         if self.__exists:
  *             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)
  */
     while (1) {
-      __pyx_1 = (__pyx_v_iter != 0);
-      if (!__pyx_1) break;
+      __pyx_2 = (__pyx_v_iter != 0);
+      if (!__pyx_2) break;
 
       /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":235
  *             iter = account.purple_account_get_status_types(self._get_structure())
@@ -15520,60 +15520,47 @@ static PyObject *__pyx_pf_6purple_7Account___get_status_types(PyObject *__pyx_v_
  *                 name = <char *> status.purple_status_type_get_name(c_statustype)
  *                 status_types.append((id, name))             # <<<<<<<<<<<<<<
  *                 iter = iter.next
- *             return status_types
+ * 
  */
-      __pyx_2 = __Pyx_PyBytes_FromString(__pyx_v_id); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_1 = __Pyx_PyBytes_FromString(__pyx_v_id); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1;}
       __pyx_3 = __Pyx_PyBytes_FromString(__pyx_v_name); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1;}
       __pyx_4 = PyTuple_New(2); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1;}
-      PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
+      PyTuple_SET_ITEM(__pyx_4, 0, __pyx_1);
       PyTuple_SET_ITEM(__pyx_4, 1, __pyx_3);
-      __pyx_2 = 0;
+      __pyx_1 = 0;
       __pyx_3 = 0;
-      __pyx_2 = __Pyx_PyObject_Append(__pyx_v_status_types, ((PyObject *)__pyx_4)); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_1 = __Pyx_PyObject_Append(__pyx_v_status_types, ((PyObject *)__pyx_4)); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
-      Py_DECREF(__pyx_2); __pyx_2 = 0;
+      Py_DECREF(__pyx_1); __pyx_1 = 0;
 
       /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":239
  *                 name = <char *> status.purple_status_type_get_name(c_statustype)
  *                 status_types.append((id, name))
  *                 iter = iter.next             # <<<<<<<<<<<<<<
- *             return status_types
- *         else:
+ * 
+ *         return status_types
  */
       __pyx_v_iter = __pyx_v_iter->next;
     }
-
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":240
- *                 status_types.append((id, name))
- *                 iter = iter.next
- *             return status_types             # <<<<<<<<<<<<<<
- *         else:
- *              return None
- */
-    Py_INCREF(__pyx_v_status_types);
-    __pyx_r = __pyx_v_status_types;
-    goto __pyx_L0;
     goto __pyx_L4;
   }
-  /*else*/ {
+  __pyx_L4:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":242
- *             return status_types
- *         else:
- *              return None             # <<<<<<<<<<<<<<
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":241
+ *                 iter = iter.next
+ * 
+ *         return status_types             # <<<<<<<<<<<<<<
  * 
  *     status_types = property(__get_status_types)
  */
-    Py_INCREF(Py_None);
-    __pyx_r = Py_None;
-    goto __pyx_L0;
-  }
-  __pyx_L4:;
+  Py_INCREF(__pyx_v_status_types);
+  __pyx_r = __pyx_v_status_types;
+  goto __pyx_L0;
 
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
-  Py_XDECREF(__pyx_2);
+  Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_3);
   Py_XDECREF(__pyx_4);
   __Pyx_AddTraceback("purple.Account.__get_status_types");
@@ -15583,7 +15570,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_status_types(PyObject *__pyx_v_
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":246
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":245
  *     status_types = property(__get_status_types)
  * 
  *     def __get_active_status(self):             # <<<<<<<<<<<<<<
@@ -15614,7 +15601,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
   PyObject *__pyx_2 = 0;
   __pyx_v_active = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":247
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":246
  * 
  *     def __get_active_status(self):
  *         cdef status.PurpleStatus* c_status = NULL             # <<<<<<<<<<<<<<
@@ -15624,7 +15611,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
   __pyx_v_c_status = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":248
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":247
  *     def __get_active_status(self):
  *         cdef status.PurpleStatus* c_status = NULL
  *         cdef char *type = NULL             # <<<<<<<<<<<<<<
@@ -15634,7 +15621,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
   __pyx_v_type = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":249
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":248
  *         cdef status.PurpleStatus* c_status = NULL
  *         cdef char *type = NULL
  *         cdef char *name = NULL             # <<<<<<<<<<<<<<
@@ -15644,7 +15631,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
   __pyx_v_name = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":250
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":249
  *         cdef char *type = NULL
  *         cdef char *name = NULL
  *         cdef char *msg = NULL             # <<<<<<<<<<<<<<
@@ -15654,29 +15641,29 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
   __pyx_v_msg = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":251
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":250
  *         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())
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 250; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":252
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":251
  *         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)
  */
-    __pyx_2 = PyDict_New(); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = PyDict_New(); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_v_active);
     __pyx_v_active = ((PyObject *)__pyx_2);
     __pyx_2 = 0;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":253
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":252
  *         if self.__exists:
  *             active = {}
  *             c_status = <status.PurpleStatus*> account.purple_account_get_active_status(self._get_structure())             # <<<<<<<<<<<<<<
@@ -15685,7 +15672,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
  */
     __pyx_v_c_status = ((PurpleStatus *)purple_account_get_active_status(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self))));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":254
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":253
  *             active = {}
  *             c_status = <status.PurpleStatus*> account.purple_account_get_active_status(self._get_structure())
  *             type = <char *> status.purple_status_get_id(c_status)             # <<<<<<<<<<<<<<
@@ -15694,7 +15681,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
  */
     __pyx_v_type = ((char *)purple_status_get_id(__pyx_v_c_status));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":255
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":254
  *             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)             # <<<<<<<<<<<<<<
@@ -15703,7 +15690,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
  */
     __pyx_v_name = ((char *)purple_status_get_name(__pyx_v_c_status));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":257
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":256
  *             name = <char *> status.purple_status_get_name(c_status)
  *             msg = <char *> status.purple_status_get_attr_string(c_status,
  *                 "message")             # <<<<<<<<<<<<<<
@@ -15712,29 +15699,29 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
  */
     __pyx_v_msg = ((char *)purple_status_get_attr_string(__pyx_v_c_status, __pyx_k_450));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":259
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":258
  *                 "message")
  * 
  *             active['type'] = type             # <<<<<<<<<<<<<<
  *             active['name'] = name
  *             if msg:
  */
-    __pyx_2 = __Pyx_PyBytes_FromString(__pyx_v_type); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    if (PyObject_SetItem(__pyx_v_active, __pyx_kp_451, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_FromString(__pyx_v_type); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 258; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    if (PyObject_SetItem(__pyx_v_active, __pyx_kp_451, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 258; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":260
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":259
  * 
  *             active['type'] = type
  *             active['name'] = name             # <<<<<<<<<<<<<<
  *             if msg:
  *                 active['message'] = msg
  */
-    __pyx_2 = __Pyx_PyBytes_FromString(__pyx_v_name); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    if (PyObject_SetItem(__pyx_v_active, __pyx_kp_452, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_FromString(__pyx_v_name); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    if (PyObject_SetItem(__pyx_v_active, __pyx_kp_452, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 259; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":261
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":260
  *             active['type'] = type
  *             active['name'] = name
  *             if msg:             # <<<<<<<<<<<<<<
@@ -15744,21 +15731,21 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
     __pyx_1 = (__pyx_v_msg != 0);
     if (__pyx_1) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":262
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":261
  *             active['name'] = name
  *             if msg:
  *                 active['message'] = msg             # <<<<<<<<<<<<<<
  * 
  *             return active
  */
-      __pyx_2 = __Pyx_PyBytes_FromString(__pyx_v_msg); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 262; __pyx_clineno = __LINE__; goto __pyx_L1;}
-      if (PyObject_SetItem(__pyx_v_active, __pyx_kp_453, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 262; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_2 = __Pyx_PyBytes_FromString(__pyx_v_msg); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      if (PyObject_SetItem(__pyx_v_active, __pyx_kp_453, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       goto __pyx_L5;
     }
     __pyx_L5:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":264
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":263
  *                 active['message'] = msg
  * 
  *             return active             # <<<<<<<<<<<<<<
@@ -15772,7 +15759,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":266
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":265
  *             return active
  *         else:
  *             return None             # <<<<<<<<<<<<<<
@@ -15796,7 +15783,7 @@ static PyObject *__pyx_pf_6purple_7Account___get_active_status(PyObject *__pyx_v
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":269
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":268
  *     active_status = property(__get_active_status)
  * 
  *     def set_username(self, username):             # <<<<<<<<<<<<<<
@@ -15811,27 +15798,27 @@ static PyObject *__pyx_pf_6purple_7Account_set_username(PyObject *__pyx_v_self,
   int __pyx_1;
   char *__pyx_2;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":276
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":275
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_set_username(self._get_structure(), \
  *                     username)
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":278
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":277
  *         if self.__exists:
  *             account.purple_account_set_username(self._get_structure(), \
  *                     username)             # <<<<<<<<<<<<<<
  *             return True
  *         else:
  */
-    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_username); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_username); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 277; __pyx_clineno = __LINE__; goto __pyx_L1;}
     purple_account_set_username(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_2);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":279
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":278
  *             account.purple_account_set_username(self._get_structure(), \
  *                     username)
  *             return True             # <<<<<<<<<<<<<<
@@ -15845,7 +15832,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_username(PyObject *__pyx_v_self,
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":281
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":280
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -15867,7 +15854,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_username(PyObject *__pyx_v_self,
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":283
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":282
  *             return False
  * 
  *     def set_protocol(self, protocol):             # <<<<<<<<<<<<<<
@@ -15883,37 +15870,37 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol(PyObject *__pyx_v_self,
   int __pyx_2;
   char *__pyx_3;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":290
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":289
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if protocol.exists and self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_set_protocol_id(self._get_structure(), \
  *                         protocol.id)
  */
-  __pyx_1 = PyObject_GetAttr(__pyx_v_protocol, __pyx_kp_exists); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 290; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_1); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 290; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = PyObject_GetAttr(__pyx_v_protocol, __pyx_kp_exists); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_1); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_2) {
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __pyx_1 = ((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists;
     Py_INCREF(__pyx_1);
   }
-  __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_1); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 290; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_1); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_2) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":292
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":291
  *         if protocol.exists and self.__exists:
  *             account.purple_account_set_protocol_id(self._get_structure(), \
  *                         protocol.id)             # <<<<<<<<<<<<<<
  *             self.__protocol = protocol
  *             return True
  */
-    __pyx_1 = PyObject_GetAttr(__pyx_v_protocol, __pyx_kp_id); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    __pyx_3 = __Pyx_PyBytes_AsString(__pyx_1); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_1 = PyObject_GetAttr(__pyx_v_protocol, __pyx_kp_id); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_3 = __Pyx_PyBytes_AsString(__pyx_1); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     purple_account_set_protocol_id(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_3);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":293
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":292
  *             account.purple_account_set_protocol_id(self._get_structure(), \
  *                         protocol.id)
  *             self.__protocol = protocol             # <<<<<<<<<<<<<<
@@ -15924,7 +15911,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol(PyObject *__pyx_v_self,
     Py_DECREF(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__protocol);
     ((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__protocol = __pyx_v_protocol;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":294
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":293
  *                         protocol.id)
  *             self.__protocol = protocol
  *             return True             # <<<<<<<<<<<<<<
@@ -15938,7 +15925,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol(PyObject *__pyx_v_self,
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":296
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":295
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -15961,7 +15948,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol(PyObject *__pyx_v_self,
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":298
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":297
  *             return False
  * 
  *     def set_protocol_options(self, po):             # <<<<<<<<<<<<<<
@@ -15994,7 +15981,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
   gboolean __pyx_8;
   __pyx_v_sett = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":314
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":313
  *         cdef glib.gboolean bool_value
  * 
  *         c_account = self._get_structure()             # <<<<<<<<<<<<<<
@@ -16003,7 +15990,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
  */
   __pyx_v_c_account = ((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self));
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":316
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":315
  *         c_account = self._get_structure()
  * 
  *         if c_account == NULL:             # <<<<<<<<<<<<<<
@@ -16013,7 +16000,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
   __pyx_1 = (__pyx_v_c_account == NULL);
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":317
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":316
  * 
  *         if c_account == NULL:
  *             return False             # <<<<<<<<<<<<<<
@@ -16027,19 +16014,19 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
   }
   __pyx_L4:;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":319
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":318
  *             return False
  * 
  *         c_plugin = plugin.purple_plugins_find_with_id(self.__protocol.id)             # <<<<<<<<<<<<<<
  *         prpl_info = plugin.PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)
  *         iter = prpl_info.protocol_options
  */
-  __pyx_2 = PyObject_GetAttr(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__protocol, __pyx_kp_id); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  __pyx_3 = __Pyx_PyBytes_AsString(__pyx_2); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_2 = PyObject_GetAttr(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__protocol, __pyx_kp_id); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 318; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_3 = __Pyx_PyBytes_AsString(__pyx_2); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 318; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_v_c_plugin = purple_plugins_find_with_id(__pyx_3);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":320
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":319
  * 
  *         c_plugin = plugin.purple_plugins_find_with_id(self.__protocol.id)
  *         prpl_info = plugin.PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)             # <<<<<<<<<<<<<<
@@ -16048,7 +16035,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
  */
   __pyx_v_prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(__pyx_v_c_plugin);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":321
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":320
  *         c_plugin = plugin.purple_plugins_find_with_id(self.__protocol.id)
  *         prpl_info = plugin.PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)
  *         iter = prpl_info.protocol_options             # <<<<<<<<<<<<<<
@@ -16057,7 +16044,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
  */
   __pyx_v_iter = __pyx_v_prpl_info->protocol_options;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":323
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":322
  *         iter = prpl_info.protocol_options
  * 
  *         while iter:             # <<<<<<<<<<<<<<
@@ -16068,7 +16055,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
     __pyx_1 = (__pyx_v_iter != 0);
     if (!__pyx_1) break;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":325
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":324
  *         while iter:
  * 
  *             option = <accountopt.PurpleAccountOption *> iter.data             # <<<<<<<<<<<<<<
@@ -16077,7 +16064,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
  */
     __pyx_v_option = ((PurpleAccountOption *)__pyx_v_iter->data);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":326
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":325
  * 
  *             option = <accountopt.PurpleAccountOption *> iter.data
  *             type = accountopt.purple_account_option_get_type(option)             # <<<<<<<<<<<<<<
@@ -16086,7 +16073,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
  */
     __pyx_v_type = purple_account_option_get_type(__pyx_v_option);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":327
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":326
  *             option = <accountopt.PurpleAccountOption *> iter.data
  *             type = accountopt.purple_account_option_get_type(option)
  *             setting = <char *> accountopt.purple_account_option_get_setting(option)             # <<<<<<<<<<<<<<
@@ -16095,43 +16082,43 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
  */
     __pyx_v_setting = ((char *)purple_account_option_get_setting(__pyx_v_option));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":329
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":328
  *             setting = <char *> accountopt.purple_account_option_get_setting(option)
  * 
  *             sett = str(<char *> setting)             # <<<<<<<<<<<<<<
  * 
  *             if not po.has_key(sett):
  */
-    __pyx_2 = __Pyx_PyBytes_FromString(((char *)__pyx_v_setting)); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_FromString(((char *)__pyx_v_setting)); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
     __pyx_2 = 0;
-    __pyx_2 = PyObject_Call(((PyObject*)&PyBytes_Type), ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = PyObject_Call(((PyObject*)&PyBytes_Type), ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
     Py_DECREF(__pyx_v_sett);
     __pyx_v_sett = __pyx_2;
     __pyx_2 = 0;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":331
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":330
  *             sett = str(<char *> setting)
  * 
  *             if not po.has_key(sett):             # <<<<<<<<<<<<<<
  *                 iter = iter.next
  *                 continue
  */
-    __pyx_4 = PyObject_GetAttr(__pyx_v_po, __pyx_kp_has_key); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_4 = PyObject_GetAttr(__pyx_v_po, __pyx_kp_has_key); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_INCREF(__pyx_v_sett);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_sett);
-    __pyx_5 = PyObject_Call(__pyx_4, ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_5 = PyObject_Call(__pyx_4, ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(((PyObject *)__pyx_2)); __pyx_2 = 0;
-    __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_5); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_5); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     __pyx_6 = (!__pyx_1);
     if (__pyx_6) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":332
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":331
  * 
  *             if not po.has_key(sett):
  *                 iter = iter.next             # <<<<<<<<<<<<<<
@@ -16140,7 +16127,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
  */
       __pyx_v_iter = __pyx_v_iter->next;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":333
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":332
  *             if not po.has_key(sett):
  *                 iter = iter.next
  *                 continue             # <<<<<<<<<<<<<<
@@ -16152,7 +16139,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
     }
     __pyx_L7:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":335
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":334
  *                 continue
  * 
  *             if type == prefs.PURPLE_PREF_STRING:             # <<<<<<<<<<<<<<
@@ -16162,19 +16149,19 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
     __pyx_1 = (__pyx_v_type == PURPLE_PREF_STRING);
     if (__pyx_1) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":337
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":336
  *             if type == prefs.PURPLE_PREF_STRING:
  * 
  *                 str_value = <char *> po[sett]             # <<<<<<<<<<<<<<
  *                 account.purple_account_set_string(c_account, setting, str_value)
  * 
  */
-      __pyx_4 = PyObject_GetItem(__pyx_v_po, __pyx_v_sett); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1;}
-      __pyx_3 = __Pyx_PyBytes_AsString(__pyx_4); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_4 = PyObject_GetItem(__pyx_v_po, __pyx_v_sett); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 336; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_3 = __Pyx_PyBytes_AsString(__pyx_4); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 336; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(__pyx_4); __pyx_4 = 0;
       __pyx_v_str_value = ((char *)__pyx_3);
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":338
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":337
  * 
  *                 str_value = <char *> po[sett]
  *                 account.purple_account_set_string(c_account, setting, str_value)             # <<<<<<<<<<<<<<
@@ -16185,7 +16172,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
       goto __pyx_L8;
     }
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":340
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":339
  *                 account.purple_account_set_string(c_account, setting, str_value)
  * 
  *             elif type == prefs.PURPLE_PREF_INT:             # <<<<<<<<<<<<<<
@@ -16195,24 +16182,24 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
     __pyx_6 = (__pyx_v_type == PURPLE_PREF_INT);
     if (__pyx_6) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":342
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":341
  *             elif type == prefs.PURPLE_PREF_INT:
  * 
  *                 int_value = int(po[sett])             # <<<<<<<<<<<<<<
  *                 account.purple_account_set_int(c_account, setting, int_value)
  * 
  */
-      __pyx_2 = PyObject_GetItem(__pyx_v_po, __pyx_v_sett); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1;}
-      __pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_2 = PyObject_GetItem(__pyx_v_po, __pyx_v_sett); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1;}
       PyTuple_SET_ITEM(__pyx_5, 0, __pyx_2);
       __pyx_2 = 0;
-      __pyx_4 = PyObject_Call(((PyObject*)&PyInt_Type), ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_4 = PyObject_Call(((PyObject*)&PyInt_Type), ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
-      __pyx_7 = __pyx_PyInt_int(__pyx_4); if (unlikely((__pyx_7 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_7 = __pyx_PyInt_int(__pyx_4); if (unlikely((__pyx_7 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(__pyx_4); __pyx_4 = 0;
       __pyx_v_int_value = __pyx_7;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":343
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":342
  * 
  *                 int_value = int(po[sett])
  *                 account.purple_account_set_int(c_account, setting, int_value)             # <<<<<<<<<<<<<<
@@ -16223,7 +16210,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
       goto __pyx_L8;
     }
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":345
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":344
  *                 account.purple_account_set_int(c_account, setting, int_value)
  * 
  *             elif type == prefs.PURPLE_PREF_BOOLEAN:             # <<<<<<<<<<<<<<
@@ -16233,24 +16220,24 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
     __pyx_1 = (__pyx_v_type == PURPLE_PREF_BOOLEAN);
     if (__pyx_1) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":347
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":346
  *             elif type == prefs.PURPLE_PREF_BOOLEAN:
  * 
  *                 bool_value = bool(po[sett])             # <<<<<<<<<<<<<<
  *                 account.purple_account_set_bool(c_account, setting, bool_value)
  * 
  */
-      __pyx_2 = PyObject_GetItem(__pyx_v_po, __pyx_v_sett); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1;}
-      __pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_2 = PyObject_GetItem(__pyx_v_po, __pyx_v_sett); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1;}
       PyTuple_SET_ITEM(__pyx_5, 0, __pyx_2);
       __pyx_2 = 0;
-      __pyx_4 = PyObject_Call(__pyx_builtin_bool, ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_4 = PyObject_Call(__pyx_builtin_bool, ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
-      __pyx_8 = __pyx_PyInt_int(__pyx_4); if (unlikely((__pyx_8 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_8 = __pyx_PyInt_int(__pyx_4); if (unlikely((__pyx_8 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(__pyx_4); __pyx_4 = 0;
       __pyx_v_bool_value = __pyx_8;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":348
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":347
  * 
  *                 bool_value = bool(po[sett])
  *                 account.purple_account_set_bool(c_account, setting, bool_value)             # <<<<<<<<<<<<<<
@@ -16261,7 +16248,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
       goto __pyx_L8;
     }
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":350
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":349
  *                 account.purple_account_set_bool(c_account, setting, bool_value)
  * 
  *             elif type == prefs.PURPLE_PREF_STRING_LIST:             # <<<<<<<<<<<<<<
@@ -16271,19 +16258,19 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
     __pyx_6 = (__pyx_v_type == PURPLE_PREF_STRING_LIST);
     if (__pyx_6) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":352
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":351
  *             elif type == prefs.PURPLE_PREF_STRING_LIST:
  * 
  *                 str_value = <char *> po[sett]             # <<<<<<<<<<<<<<
  *                 account.purple_account_set_string(c_account, setting, str_value)
  * 
  */
-      __pyx_2 = PyObject_GetItem(__pyx_v_po, __pyx_v_sett); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1;}
-      __pyx_3 = __Pyx_PyBytes_AsString(__pyx_2); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_2 = PyObject_GetItem(__pyx_v_po, __pyx_v_sett); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_3 = __Pyx_PyBytes_AsString(__pyx_2); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __pyx_v_str_value = ((char *)__pyx_3);
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":353
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":352
  * 
  *                 str_value = <char *> po[sett]
  *                 account.purple_account_set_string(c_account, setting, str_value)             # <<<<<<<<<<<<<<
@@ -16295,7 +16282,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
     }
     __pyx_L8:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":355
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":354
  *                 account.purple_account_set_string(c_account, setting, str_value)
  * 
  *             iter = iter.next             # <<<<<<<<<<<<<<
@@ -16306,7 +16293,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
     __pyx_L5:;
   }
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":357
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":356
  *             iter = iter.next
  * 
  *         return True             # <<<<<<<<<<<<<<
@@ -16330,7 +16317,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_protocol_options(PyObject *__pyx_
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":359
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":358
  *         return True
  * 
  *     def set_password(self, password):             # <<<<<<<<<<<<<<
@@ -16345,27 +16332,27 @@ static PyObject *__pyx_pf_6purple_7Account_set_password(PyObject *__pyx_v_self,
   int __pyx_1;
   char *__pyx_2;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":366
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":365
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_set_password(self._get_structure(), \
  *                     password)
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 366; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 365; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":368
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":367
  *         if self.__exists:
  *             account.purple_account_set_password(self._get_structure(), \
  *                     password)             # <<<<<<<<<<<<<<
  *             return True
  *         else:
  */
-    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_password); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 368; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_password); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 367; __pyx_clineno = __LINE__; goto __pyx_L1;}
     purple_account_set_password(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_2);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":369
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":368
  *             account.purple_account_set_password(self._get_structure(), \
  *                     password)
  *             return True             # <<<<<<<<<<<<<<
@@ -16379,7 +16366,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_password(PyObject *__pyx_v_self,
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":371
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":370
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -16401,7 +16388,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_password(PyObject *__pyx_v_self,
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":373
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":372
  *             return False
  * 
  *     def set_alias(self, alias):             # <<<<<<<<<<<<<<
@@ -16416,27 +16403,27 @@ static PyObject *__pyx_pf_6purple_7Account_set_alias(PyObject *__pyx_v_self, PyO
   int __pyx_1;
   char *__pyx_2;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":380
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":379
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_set_alias(self._get_structure(), \
  *                     alias)
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 380; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 379; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":382
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":381
  *         if self.__exists:
  *             account.purple_account_set_alias(self._get_structure(), \
  *                     alias)             # <<<<<<<<<<<<<<
  *             return True
  *         else:
  */
-    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_alias); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_alias); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L1;}
     purple_account_set_alias(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_2);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":383
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":382
  *             account.purple_account_set_alias(self._get_structure(), \
  *                     alias)
  *             return True             # <<<<<<<<<<<<<<
@@ -16450,7 +16437,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_alias(PyObject *__pyx_v_self, PyO
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":385
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":384
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -16472,7 +16459,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_alias(PyObject *__pyx_v_self, PyO
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":387
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":386
  *             return False
  * 
  *     def set_user_info(self, user_info):             # <<<<<<<<<<<<<<
@@ -16487,27 +16474,27 @@ static PyObject *__pyx_pf_6purple_7Account_set_user_info(PyObject *__pyx_v_self,
   int __pyx_1;
   char *__pyx_2;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":394
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":393
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_set_user_info(self._get_structure(), \
  *                     user_info)
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":396
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":395
  *         if self.__exists:
  *             account.purple_account_set_user_info(self._get_structure(), \
  *                     user_info)             # <<<<<<<<<<<<<<
  *             return True
  *         else:
  */
-    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_user_info); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_user_info); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 395; __pyx_clineno = __LINE__; goto __pyx_L1;}
     purple_account_set_user_info(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_2);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":397
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":396
  *             account.purple_account_set_user_info(self._get_structure(), \
  *                     user_info)
  *             return True             # <<<<<<<<<<<<<<
@@ -16521,7 +16508,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_user_info(PyObject *__pyx_v_self,
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":399
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":398
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -16543,7 +16530,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_user_info(PyObject *__pyx_v_self,
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":401
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":400
  *             return False
  * 
  *     def set_remember_password(self, remember_password):             # <<<<<<<<<<<<<<
@@ -16558,27 +16545,27 @@ static PyObject *__pyx_pf_6purple_7Account_set_remember_password(PyObject *__pyx
   int __pyx_1;
   gboolean __pyx_2;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":409
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":408
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_set_remember_password( \
  *                 self._get_structure(), remember_password)
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 409; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 408; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":411
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":410
  *         if self.__exists:
  *             account.purple_account_set_remember_password( \
  *                 self._get_structure(), remember_password)             # <<<<<<<<<<<<<<
  *             return True
  *         else:
  */
-    __pyx_2 = __pyx_PyInt_int(__pyx_v_remember_password); if (unlikely((__pyx_2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __pyx_PyInt_int(__pyx_v_remember_password); if (unlikely((__pyx_2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1;}
     purple_account_set_remember_password(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_2);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":412
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":411
  *             account.purple_account_set_remember_password( \
  *                 self._get_structure(), remember_password)
  *             return True             # <<<<<<<<<<<<<<
@@ -16592,7 +16579,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_remember_password(PyObject *__pyx
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":414
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":413
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -16614,7 +16601,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_remember_password(PyObject *__pyx
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":416
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":415
  *             return False
  * 
  *     def set_enabled(self, value):             # <<<<<<<<<<<<<<
@@ -16632,36 +16619,36 @@ static PyObject *__pyx_pf_6purple_7Account_set_enabled(PyObject *__pyx_v_self, P
   PyObject *__pyx_4 = 0;
   gboolean __pyx_5;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":423
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":422
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_set_enabled(self._get_structure(), \
  *                     self.__core.ui_name, bool(value))
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":425
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":424
  *         if self.__exists:
  *             account.purple_account_set_enabled(self._get_structure(), \
  *                     self.__core.ui_name, bool(value))             # <<<<<<<<<<<<<<
  *             return True
  *         else:
  */
-    __pyx_2 = PyObject_GetAttr(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__core, __pyx_kp_ui_name); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    __pyx_3 = __Pyx_PyBytes_AsString(__pyx_2); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = PyObject_GetAttr(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__core, __pyx_kp_ui_name); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_3 = __Pyx_PyBytes_AsString(__pyx_2); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_INCREF(__pyx_v_value);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_value);
-    __pyx_4 = PyObject_Call(__pyx_builtin_bool, ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_4 = PyObject_Call(__pyx_builtin_bool, ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(((PyObject *)__pyx_2)); __pyx_2 = 0;
-    __pyx_5 = __pyx_PyInt_int(__pyx_4); if (unlikely((__pyx_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_5 = __pyx_PyInt_int(__pyx_4); if (unlikely((__pyx_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     purple_account_set_enabled(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_3, __pyx_5);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":426
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":425
  *             account.purple_account_set_enabled(self._get_structure(), \
  *                     self.__core.ui_name, bool(value))
  *             return True             # <<<<<<<<<<<<<<
@@ -16675,7 +16662,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_enabled(PyObject *__pyx_v_self, P
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":428
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":427
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -16699,7 +16686,7 @@ static PyObject *__pyx_pf_6purple_7Account_set_enabled(PyObject *__pyx_v_self, P
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":430
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":429
  *             return False
  * 
  *     def new(self):             # <<<<<<<<<<<<<<
@@ -16716,17 +16703,17 @@ static PyObject *__pyx_pf_6purple_7Account_new(PyObject *__pyx_v_self, PyObject
   PyObject *__pyx_3 = 0;
   char *__pyx_4;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":436
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":435
  *         @return True if successful, False if account already exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             return False
  *         else:
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 435; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":437
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":436
  *         """
  *         if self.__exists:
  *             return False             # <<<<<<<<<<<<<<
@@ -16740,20 +16727,20 @@ static PyObject *__pyx_pf_6purple_7Account_new(PyObject *__pyx_v_self, PyObject
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":440
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":439
  *         else:
  *             account.purple_accounts_add(account.purple_account_new( \
  *                     self.__username, self.__protocol.id))             # <<<<<<<<<<<<<<
  * 
  *             self.__exists = True
  */
-    __pyx_2 = __Pyx_PyBytes_AsString(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__username); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    __pyx_3 = PyObject_GetAttr(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__protocol, __pyx_kp_id); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    __pyx_4 = __Pyx_PyBytes_AsString(__pyx_3); if (unlikely((!__pyx_4) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_AsString(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__username); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 439; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_3 = PyObject_GetAttr(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__protocol, __pyx_kp_id); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 439; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_4 = __Pyx_PyBytes_AsString(__pyx_3); if (unlikely((!__pyx_4) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 439; __pyx_clineno = __LINE__; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     purple_accounts_add(purple_account_new(__pyx_2, __pyx_4));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":442
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":441
  *                     self.__username, self.__protocol.id))
  * 
  *             self.__exists = True             # <<<<<<<<<<<<<<
@@ -16764,7 +16751,7 @@ static PyObject *__pyx_pf_6purple_7Account_new(PyObject *__pyx_v_self, PyObject
     Py_DECREF(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists);
     ((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists = Py_True;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":443
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":442
  * 
  *             self.__exists = True
  *             return True             # <<<<<<<<<<<<<<
@@ -16787,7 +16774,7 @@ static PyObject *__pyx_pf_6purple_7Account_new(PyObject *__pyx_v_self, PyObject
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":445
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":444
  *             return True
  * 
  *     def remove(self):             # <<<<<<<<<<<<<<
@@ -16803,17 +16790,17 @@ static PyObject *__pyx_pf_6purple_7Account_remove(PyObject *__pyx_v_self, PyObje
   int __pyx_1;
   __pyx_v_self__exists = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":451
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":450
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_accounts_delete(self._get_structure())
  *             self__exists = False
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 451; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 450; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":452
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":451
  *         """
  *         if self.__exists:
  *             account.purple_accounts_delete(self._get_structure())             # <<<<<<<<<<<<<<
@@ -16822,7 +16809,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove(PyObject *__pyx_v_self, PyObje
  */
     purple_accounts_delete(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":453
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":452
  *         if self.__exists:
  *             account.purple_accounts_delete(self._get_structure())
  *             self__exists = False             # <<<<<<<<<<<<<<
@@ -16833,7 +16820,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove(PyObject *__pyx_v_self, PyObje
     Py_DECREF(__pyx_v_self__exists);
     __pyx_v_self__exists = Py_False;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":454
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":453
  *             account.purple_accounts_delete(self._get_structure())
  *             self__exists = False
  *             return True             # <<<<<<<<<<<<<<
@@ -16847,7 +16834,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove(PyObject *__pyx_v_self, PyObje
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":456
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":455
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -16870,7 +16857,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove(PyObject *__pyx_v_self, PyObje
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":458
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":457
  *             return False
  * 
  *     def connect(self):             # <<<<<<<<<<<<<<
@@ -16884,17 +16871,17 @@ static PyObject *__pyx_pf_6purple_7Account_connect(PyObject *__pyx_v_self, PyObj
   PyObject *__pyx_r;
   int __pyx_1;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":464
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":463
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_connect(self._get_structure())
  *             return True
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 464; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 463; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":465
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":464
  *         """
  *         if self.__exists:
  *             account.purple_account_connect(self._get_structure())             # <<<<<<<<<<<<<<
@@ -16903,7 +16890,7 @@ static PyObject *__pyx_pf_6purple_7Account_connect(PyObject *__pyx_v_self, PyObj
  */
     purple_account_connect(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":466
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":465
  *         if self.__exists:
  *             account.purple_account_connect(self._get_structure())
  *             return True             # <<<<<<<<<<<<<<
@@ -16917,7 +16904,7 @@ static PyObject *__pyx_pf_6purple_7Account_connect(PyObject *__pyx_v_self, PyObj
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":468
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":467
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -16939,7 +16926,7 @@ static PyObject *__pyx_pf_6purple_7Account_connect(PyObject *__pyx_v_self, PyObj
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":470
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":469
  *             return False
  * 
  *     def disconnect(self):             # <<<<<<<<<<<<<<
@@ -16953,17 +16940,17 @@ static PyObject *__pyx_pf_6purple_7Account_disconnect(PyObject *__pyx_v_self, Py
   PyObject *__pyx_r;
   int __pyx_1;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":476
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":475
  *         @return True if successful, False if account doesn't exists
  *         """
  *         if self.__exists:             # <<<<<<<<<<<<<<
  *             account.purple_account_disconnect(self._get_structure())
  *             return True
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 476; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 475; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":477
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":476
  *         """
  *         if self.__exists:
  *             account.purple_account_disconnect(self._get_structure())             # <<<<<<<<<<<<<<
@@ -16972,7 +16959,7 @@ static PyObject *__pyx_pf_6purple_7Account_disconnect(PyObject *__pyx_v_self, Py
  */
     purple_account_disconnect(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)));
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":478
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":477
  *         if self.__exists:
  *             account.purple_account_disconnect(self._get_structure())
  *             return True             # <<<<<<<<<<<<<<
@@ -16986,7 +16973,7 @@ static PyObject *__pyx_pf_6purple_7Account_disconnect(PyObject *__pyx_v_self, Py
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":480
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":479
  *             return True
  *         else:
  *             return False             # <<<<<<<<<<<<<<
@@ -17008,7 +16995,7 @@ static PyObject *__pyx_pf_6purple_7Account_disconnect(PyObject *__pyx_v_self, Py
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":482
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":481
  *             return False
  * 
  *     def add_buddy(self, name, alias=None, group=None):             # <<<<<<<<<<<<<<
@@ -17042,7 +17029,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
     }
   }
   else {
-    if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|OO", __pyx_argnames, &__pyx_v_name, &__pyx_v_alias, &__pyx_v_group))) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L2;}
+    if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|OO", __pyx_argnames, &__pyx_v_name, &__pyx_v_alias, &__pyx_v_group))) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 481; __pyx_clineno = __LINE__; goto __pyx_L2;}
   }
   goto __pyx_L3;
   __pyx_L2:;
@@ -17050,7 +17037,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
   return NULL;
   __pyx_L3:;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":490
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":489
  *         @return True if successfull, False otherwise
  *         """
  *         cdef blist.PurpleBuddy *c_buddy = NULL             # <<<<<<<<<<<<<<
@@ -17060,7 +17047,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
   __pyx_v_c_buddy = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":491
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":490
  *         """
  *         cdef blist.PurpleBuddy *c_buddy = NULL
  *         cdef blist.PurpleGroup *c_group = NULL             # <<<<<<<<<<<<<<
@@ -17070,7 +17057,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
   __pyx_v_c_group = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":492
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":491
  *         cdef blist.PurpleBuddy *c_buddy = NULL
  *         cdef blist.PurpleGroup *c_group = NULL
  *         cdef char *c_alias = NULL             # <<<<<<<<<<<<<<
@@ -17080,30 +17067,30 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
   __pyx_v_c_alias = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":494
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":493
  *         cdef char *c_alias = NULL
  * 
  *         if alias:             # <<<<<<<<<<<<<<
  *             c_alias = alias
  *         else:
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_alias); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 494; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_alias); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":495
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":494
  * 
  *         if alias:
  *             c_alias = alias             # <<<<<<<<<<<<<<
  *         else:
  *             c_alias = NULL
  */
-    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_alias); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_alias); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 494; __pyx_clineno = __LINE__; goto __pyx_L1;}
     __pyx_v_c_alias = __pyx_2;
     goto __pyx_L4;
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":497
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":496
  *             c_alias = alias
  *         else:
  *             c_alias = NULL             # <<<<<<<<<<<<<<
@@ -17114,7 +17101,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
   }
   __pyx_L4:;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":499
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":498
  *             c_alias = NULL
  * 
  *         if self.__exists and \             # <<<<<<<<<<<<<<
@@ -17123,35 +17110,35 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
  */
   __pyx_3 = ((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists;
   Py_INCREF(__pyx_3);
-  __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_3); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 499; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_3); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 498; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_1) {
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":500
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":499
  * 
  *         if self.__exists and \
  *                 account.purple_account_is_connected(self._get_structure()):             # <<<<<<<<<<<<<<
  *             if blist.purple_find_buddy(self._get_structure(), name):
  *                 return False
  */
-    __pyx_3 = PyInt_FromLong(purple_account_is_connected(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)))); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_3 = PyInt_FromLong(purple_account_is_connected(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)))); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 499; __pyx_clineno = __LINE__; goto __pyx_L1;}
   }
-  __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_3); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 499; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_3); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 498; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":501
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":500
  *         if self.__exists and \
  *                 account.purple_account_is_connected(self._get_structure()):
  *             if blist.purple_find_buddy(self._get_structure(), name):             # <<<<<<<<<<<<<<
  *                 return False
  * 
  */
-    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_name); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_name); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L1;}
     __pyx_1 = (purple_find_buddy(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_2) != 0);
     if (__pyx_1) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":502
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":501
  *                 account.purple_account_is_connected(self._get_structure()):
  *             if blist.purple_find_buddy(self._get_structure(), name):
  *                 return False             # <<<<<<<<<<<<<<
@@ -17165,27 +17152,27 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
     }
     __pyx_L6:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":504
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":503
  *                 return False
  * 
  *             if group:             # <<<<<<<<<<<<<<
  *                 c_group = blist.purple_find_group(group)
  *                 if c_group == NULL:
  */
-    __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_group); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 504; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_group); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 503; __pyx_clineno = __LINE__; goto __pyx_L1;}
     if (__pyx_1) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":505
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":504
  * 
  *             if group:
  *                 c_group = blist.purple_find_group(group)             # <<<<<<<<<<<<<<
  *                 if c_group == NULL:
  *                     c_group = blist.purple_group_new(group)
  */
-      __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_group); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 505; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_group); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 504; __pyx_clineno = __LINE__; goto __pyx_L1;}
       __pyx_v_c_group = purple_find_group(__pyx_2);
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":506
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":505
  *             if group:
  *                 c_group = blist.purple_find_group(group)
  *                 if c_group == NULL:             # <<<<<<<<<<<<<<
@@ -17195,14 +17182,14 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
       __pyx_1 = (__pyx_v_c_group == NULL);
       if (__pyx_1) {
 
-        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":507
+        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":506
  *                 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(), \
  */
-        __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_group); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_group); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 506; __pyx_clineno = __LINE__; goto __pyx_L1;}
         __pyx_v_c_group = purple_group_new(__pyx_2);
         goto __pyx_L8;
       }
@@ -17211,17 +17198,17 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
     }
     __pyx_L7:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":510
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":509
  * 
  *             c_buddy = blist.purple_buddy_new(self._get_structure(), \
  *                     name, c_alias)             # <<<<<<<<<<<<<<
  *             if c_buddy == NULL:
  *                 return False
  */
-    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_name); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 510; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_2 = __Pyx_PyBytes_AsString(__pyx_v_name); if (unlikely((!__pyx_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1;}
     __pyx_v_c_buddy = purple_buddy_new(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_2, __pyx_v_c_alias);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":511
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":510
  *             c_buddy = blist.purple_buddy_new(self._get_structure(), \
  *                     name, c_alias)
  *             if c_buddy == NULL:             # <<<<<<<<<<<<<<
@@ -17231,7 +17218,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
     __pyx_1 = (__pyx_v_c_buddy == NULL);
     if (__pyx_1) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":512
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":511
  *                     name, c_alias)
  *             if c_buddy == NULL:
  *                 return False             # <<<<<<<<<<<<<<
@@ -17245,7 +17232,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
     }
     __pyx_L9:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":514
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":513
  *                 return False
  * 
  *             blist.purple_blist_add_buddy(c_buddy, NULL, c_group, NULL)             # <<<<<<<<<<<<<<
@@ -17254,7 +17241,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
  */
     purple_blist_add_buddy(__pyx_v_c_buddy, NULL, __pyx_v_c_group, NULL);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":515
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":514
  * 
  *             blist.purple_blist_add_buddy(c_buddy, NULL, c_group, NULL)
  *             account.purple_account_add_buddy(self._get_structure(), c_buddy)             # <<<<<<<<<<<<<<
@@ -17263,7 +17250,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
  */
     purple_account_add_buddy(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_v_c_buddy);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":516
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":515
  *             blist.purple_blist_add_buddy(c_buddy, NULL, c_group, NULL)
  *             account.purple_account_add_buddy(self._get_structure(), c_buddy)
  *             if c_alias:             # <<<<<<<<<<<<<<
@@ -17273,7 +17260,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
     __pyx_1 = (__pyx_v_c_alias != 0);
     if (__pyx_1) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":517
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":516
  *             account.purple_account_add_buddy(self._get_structure(), c_buddy)
  *             if c_alias:
  *                 blist.purple_blist_alias_buddy(c_buddy, c_alias)             # <<<<<<<<<<<<<<
@@ -17282,7 +17269,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
  */
       purple_blist_alias_buddy(__pyx_v_c_buddy, __pyx_v_c_alias);
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":518
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":517
  *             if c_alias:
  *                 blist.purple_blist_alias_buddy(c_buddy, c_alias)
  *                 server.serv_alias_buddy(c_buddy)             # <<<<<<<<<<<<<<
@@ -17294,7 +17281,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
     }
     __pyx_L10:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":520
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":519
  *                 server.serv_alias_buddy(c_buddy)
  * 
  *             return True             # <<<<<<<<<<<<<<
@@ -17308,7 +17295,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":523
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":522
  * 
  *         else:
  *             return None             # <<<<<<<<<<<<<<
@@ -17331,7 +17318,7 @@ static PyObject *__pyx_pf_6purple_7Account_add_buddy(PyObject *__pyx_v_self, PyO
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":525
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":524
  *             return None
  * 
  *     def remove_buddy(self, name):             # <<<<<<<<<<<<<<
@@ -17349,7 +17336,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
   int __pyx_2;
   char *__pyx_3;
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":532
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":531
  *         @return True if successful, False otherwise
  *         """
  *         cdef blist.PurpleBuddy *c_buddy = NULL             # <<<<<<<<<<<<<<
@@ -17359,7 +17346,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
   __pyx_v_c_buddy = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":533
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":532
  *         """
  *         cdef blist.PurpleBuddy *c_buddy = NULL
  *         cdef blist.PurpleGroup *c_group = NULL             # <<<<<<<<<<<<<<
@@ -17369,7 +17356,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
   __pyx_v_c_group = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":535
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":534
  *         cdef blist.PurpleGroup *c_group = NULL
  * 
  *         if self.__exists and \             # <<<<<<<<<<<<<<
@@ -17378,34 +17365,34 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
  */
   __pyx_1 = ((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists;
   Py_INCREF(__pyx_1);
-  __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_1); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_1); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1;}
   if (__pyx_2) {
     Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":536
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":535
  * 
  *         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:
  */
-    __pyx_1 = PyInt_FromLong(purple_account_is_connected(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)))); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_1 = PyInt_FromLong(purple_account_is_connected(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)))); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1;}
   }
-  __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_1); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 535; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_1); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 534; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_2) {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":537
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":536
  *         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
  */
-    __pyx_3 = __Pyx_PyBytes_AsString(__pyx_v_name); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1;}
+    __pyx_3 = __Pyx_PyBytes_AsString(__pyx_v_name); if (unlikely((!__pyx_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
     __pyx_v_c_buddy = purple_find_buddy(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_3);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":538
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":537
  *                 account.purple_account_is_connected(self._get_structure()):
  *             c_buddy = blist.purple_find_buddy(self._get_structure(), name)
  *             if c_buddy == NULL:             # <<<<<<<<<<<<<<
@@ -17415,7 +17402,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
     __pyx_2 = (__pyx_v_c_buddy == NULL);
     if (__pyx_2) {
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":539
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":538
  *             c_buddy = blist.purple_find_buddy(self._get_structure(), name)
  *             if c_buddy == NULL:
  *                 return False             # <<<<<<<<<<<<<<
@@ -17429,7 +17416,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
     }
     __pyx_L5:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":541
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":540
  *                 return False
  * 
  *             c_group = blist.purple_buddy_get_group(c_buddy)             # <<<<<<<<<<<<<<
@@ -17438,7 +17425,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
  */
     __pyx_v_c_group = purple_buddy_get_group(__pyx_v_c_buddy);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":544
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":543
  * 
  *             account.purple_account_remove_buddy(self._get_structure(), \
  *                     c_buddy, c_group)             # <<<<<<<<<<<<<<
@@ -17447,7 +17434,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
  */
     purple_account_remove_buddy(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), __pyx_v_c_buddy, __pyx_v_c_group);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":545
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":544
  *             account.purple_account_remove_buddy(self._get_structure(), \
  *                     c_buddy, c_group)
  *             blist.purple_blist_remove_buddy(c_buddy)             # <<<<<<<<<<<<<<
@@ -17456,7 +17443,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
  */
     purple_blist_remove_buddy(__pyx_v_c_buddy);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":546
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":545
  *                     c_buddy, c_group)
  *             blist.purple_blist_remove_buddy(c_buddy)
  *             return True             # <<<<<<<<<<<<<<
@@ -17470,7 +17457,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
   }
   /*else*/ {
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":548
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":547
  *             return True
  *         else:
  *             return None             # <<<<<<<<<<<<<<
@@ -17493,7 +17480,7 @@ static PyObject *__pyx_pf_6purple_7Account_remove_buddy(PyObject *__pyx_v_self,
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":550
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":549
  *             return None
  * 
  *     def get_buddies_online(self):             # <<<<<<<<<<<<<<
@@ -17518,7 +17505,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
   __pyx_v_name = Py_None; Py_INCREF(Py_None);
   __pyx_v_new_buddy = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":551
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":550
  * 
  *     def get_buddies_online(self):
  *         cdef glib.GSList *iter = NULL             # <<<<<<<<<<<<<<
@@ -17528,7 +17515,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
   __pyx_v_iter = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":552
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":551
  *     def get_buddies_online(self):
  *         cdef glib.GSList *iter = NULL
  *         cdef blist.PurpleBuddy *c_buddy = NULL             # <<<<<<<<<<<<<<
@@ -17538,19 +17525,31 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
   __pyx_v_c_buddy = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":553
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":552
  *         cdef glib.GSList *iter = NULL
  *         cdef blist.PurpleBuddy *c_buddy = NULL
  *         cdef char *c_alias = NULL             # <<<<<<<<<<<<<<
  * 
- *         if self.__exists and \
+ *         buddies_list = []
  */
   __pyx_v_c_alias = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":555
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":554
  *         cdef char *c_alias = NULL
  * 
+ *         buddies_list = []             # <<<<<<<<<<<<<<
+ *         if self.__exists and \
+ *                 account.purple_account_is_connected(self._get_structure()):
+ */
+  __pyx_1 = PyList_New(0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 554; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(__pyx_v_buddies_list);
+  __pyx_v_buddies_list = ((PyObject *)__pyx_1);
+  __pyx_1 = 0;
+
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":555
+ * 
+ *         buddies_list = []
  *         if self.__exists and \             # <<<<<<<<<<<<<<
  *                 account.purple_account_is_connected(self._get_structure()):
  *             iter = blist.purple_find_buddies(self._get_structure(), NULL)
@@ -17562,7 +17561,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
     Py_DECREF(__pyx_1); __pyx_1 = 0;
 
     /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":556
- * 
+ *         buddies_list = []
  *         if self.__exists and \
  *                 account.purple_account_is_connected(self._get_structure()):             # <<<<<<<<<<<<<<
  *             iter = blist.purple_find_buddies(self._get_structure(), NULL)
@@ -17579,25 +17578,13 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
  *                 account.purple_account_is_connected(self._get_structure()):
  *             iter = blist.purple_find_buddies(self._get_structure(), NULL)             # <<<<<<<<<<<<<<
  * 
- *             buddies_list = []
+ *             while iter:
  */
     __pyx_v_iter = purple_find_buddies(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), NULL);
 
     /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":559
  *             iter = blist.purple_find_buddies(self._get_structure(), NULL)
  * 
- *             buddies_list = []             # <<<<<<<<<<<<<<
- *             while iter:
- *                 c_alias = NULL
- */
-    __pyx_1 = PyList_New(0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 559; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    Py_DECREF(__pyx_v_buddies_list);
-    __pyx_v_buddies_list = ((PyObject *)__pyx_1);
-    __pyx_1 = 0;
-
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":560
- * 
- *             buddies_list = []
  *             while iter:             # <<<<<<<<<<<<<<
  *                 c_alias = NULL
  *                 c_buddy = <blist.PurpleBuddy *> iter.data
@@ -17606,8 +17593,8 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
       __pyx_2 = (__pyx_v_iter != 0);
       if (!__pyx_2) break;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":561
- *             buddies_list = []
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":560
+ * 
  *             while iter:
  *                 c_alias = NULL             # <<<<<<<<<<<<<<
  *                 c_buddy = <blist.PurpleBuddy *> iter.data
@@ -17615,7 +17602,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
  */
       __pyx_v_c_alias = NULL;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":562
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":561
  *             while iter:
  *                 c_alias = NULL
  *                 c_buddy = <blist.PurpleBuddy *> iter.data             # <<<<<<<<<<<<<<
@@ -17624,7 +17611,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
  */
       __pyx_v_c_buddy = ((PurpleBuddy *)__pyx_v_iter->data);
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":563
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":562
  *                 c_alias = NULL
  *                 c_buddy = <blist.PurpleBuddy *> iter.data
  *                 if <blist.PurpleBuddy *> c_buddy and \             # <<<<<<<<<<<<<<
@@ -17634,7 +17621,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
       __pyx_2 = (((PurpleBuddy *)__pyx_v_c_buddy) != 0);
       if (__pyx_2) {
 
-        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":565
+        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":564
  *                 if <blist.PurpleBuddy *> c_buddy and \
  *                         status.purple_presence_is_online( \
  *                                 blist.purple_buddy_get_presence(c_buddy)):             # <<<<<<<<<<<<<<
@@ -17645,37 +17632,37 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
       }
       if (__pyx_2) {
 
-        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":566
+        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":565
  *                         status.purple_presence_is_online( \
  *                                 blist.purple_buddy_get_presence(c_buddy)):
  *                     name = <char *> blist.purple_buddy_get_name(c_buddy)             # <<<<<<<<<<<<<<
  * 
  *                     new_buddy = Buddy(name, self)
  */
-        __pyx_1 = __Pyx_PyBytes_FromString(((char *)purple_buddy_get_name(__pyx_v_c_buddy))); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 566; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        __pyx_1 = __Pyx_PyBytes_FromString(((char *)purple_buddy_get_name(__pyx_v_c_buddy))); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 565; __pyx_clineno = __LINE__; goto __pyx_L1;}
         Py_DECREF(__pyx_v_name);
         __pyx_v_name = __pyx_1;
         __pyx_1 = 0;
 
-        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":568
+        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":567
  *                     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)
  */
-        __pyx_1 = PyTuple_New(2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 568; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        __pyx_1 = PyTuple_New(2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 567; __pyx_clineno = __LINE__; goto __pyx_L1;}
         Py_INCREF(__pyx_v_name);
         PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_name);
         Py_INCREF(__pyx_v_self);
         PyTuple_SET_ITEM(__pyx_1, 1, __pyx_v_self);
-        __pyx_3 = PyObject_Call(((PyObject*)__pyx_ptype_6purple_Buddy), ((PyObject *)__pyx_1), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 568; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        __pyx_3 = PyObject_Call(((PyObject*)__pyx_ptype_6purple_Buddy), ((PyObject *)__pyx_1), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 567; __pyx_clineno = __LINE__; goto __pyx_L1;}
         Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
         Py_DECREF(__pyx_v_new_buddy);
         __pyx_v_new_buddy = __pyx_3;
         __pyx_3 = 0;
 
-        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":570
+        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":569
  *                     new_buddy = Buddy(name, self)
  * 
  *                     c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)             # <<<<<<<<<<<<<<
@@ -17684,7 +17671,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
  */
         __pyx_v_c_alias = ((char *)purple_buddy_get_alias_only(__pyx_v_c_buddy));
 
-        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":571
+        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":570
  * 
  *                     c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)
  *                     if c_alias:             # <<<<<<<<<<<<<<
@@ -17694,19 +17681,19 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
         __pyx_2 = (__pyx_v_c_alias != 0);
         if (__pyx_2) {
 
-          /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":572
+          /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":571
  *                     c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)
  *                     if c_alias:
  *                         new_buddy.set_alias(c_alias)             # <<<<<<<<<<<<<<
  * 
  *                     buddies_list.append(new_buddy)
  */
-          __pyx_1 = PyObject_GetAttr(__pyx_v_new_buddy, __pyx_kp_set_alias); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1;}
-          __pyx_3 = __Pyx_PyBytes_FromString(__pyx_v_c_alias); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1;}
-          __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1;}
+          __pyx_1 = PyObject_GetAttr(__pyx_v_new_buddy, __pyx_kp_set_alias); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1;}
+          __pyx_3 = __Pyx_PyBytes_FromString(__pyx_v_c_alias); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1;}
+          __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1;}
           PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3);
           __pyx_3 = 0;
-          __pyx_3 = PyObject_Call(__pyx_1, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 572; __pyx_clineno = __LINE__; goto __pyx_L1;}
+          __pyx_3 = PyObject_Call(__pyx_1, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1;}
           Py_DECREF(__pyx_1); __pyx_1 = 0;
           Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
           Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -17714,55 +17701,42 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
         }
         __pyx_L8:;
 
-        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":574
+        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":573
  *                         new_buddy.set_alias(c_alias)
  * 
  *                     buddies_list.append(new_buddy)             # <<<<<<<<<<<<<<
  *                 iter = iter.next
- *             return buddies_list
+ * 
  */
-        __pyx_1 = __Pyx_PyObject_Append(__pyx_v_buddies_list, __pyx_v_new_buddy); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 574; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        __pyx_1 = __Pyx_PyObject_Append(__pyx_v_buddies_list, __pyx_v_new_buddy); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 573; __pyx_clineno = __LINE__; goto __pyx_L1;}
         Py_DECREF(__pyx_1); __pyx_1 = 0;
         goto __pyx_L7;
       }
       __pyx_L7:;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":575
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":574
  * 
  *                     buddies_list.append(new_buddy)
  *                 iter = iter.next             # <<<<<<<<<<<<<<
- *             return buddies_list
- *         else:
+ * 
+ *         return buddies_list
  */
       __pyx_v_iter = __pyx_v_iter->next;
     }
-
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":576
- *                     buddies_list.append(new_buddy)
- *                 iter = iter.next
- *             return buddies_list             # <<<<<<<<<<<<<<
- *         else:
- *             return None
- */
-    Py_INCREF(__pyx_v_buddies_list);
-    __pyx_r = __pyx_v_buddies_list;
-    goto __pyx_L0;
     goto __pyx_L4;
   }
-  /*else*/ {
+  __pyx_L4:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":578
- *             return buddies_list
- *         else:
- *             return None             # <<<<<<<<<<<<<<
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":576
+ *                 iter = iter.next
+ * 
+ *         return buddies_list             # <<<<<<<<<<<<<<
  * 
  *     def get_buddies(self):
  */
-    Py_INCREF(Py_None);
-    __pyx_r = Py_None;
-    goto __pyx_L0;
-  }
-  __pyx_L4:;
+  Py_INCREF(__pyx_v_buddies_list);
+  __pyx_r = __pyx_v_buddies_list;
+  goto __pyx_L0;
 
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
@@ -17779,15 +17753,16 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies_online(PyObject *__pyx_v_
   return __pyx_r;
 }
 
-/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":580
- *             return None
+/* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":578
+ *         return buddies_list
  * 
  *     def get_buddies(self):             # <<<<<<<<<<<<<<
- *         cdef glib.GSList *iter = NULL
- *         cdef blist.PurpleBuddy *c_buddy = NULL
+ *         """
+ *         @return Account's buddies list
  */
 
 static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, PyObject *unused); /*proto*/
+static char __pyx_doc_6purple_7Account_get_buddies[] = "\n        @return Account\'s buddies list\n        ";
 static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, PyObject *unused) {
   GSList *__pyx_v_iter;
   PurpleBuddy *__pyx_v_c_buddy;
@@ -17796,17 +17771,17 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, P
   PyObject *__pyx_v_name;
   PyObject *__pyx_v_new_buddy;
   PyObject *__pyx_r;
-  int __pyx_1;
-  PyObject *__pyx_2 = 0;
+  PyObject *__pyx_1 = 0;
+  int __pyx_2;
   PyObject *__pyx_3 = 0;
   PyObject *__pyx_4 = 0;
   __pyx_v_buddies_list = Py_None; Py_INCREF(Py_None);
   __pyx_v_name = Py_None; Py_INCREF(Py_None);
   __pyx_v_new_buddy = Py_None; Py_INCREF(Py_None);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":581
- * 
- *     def get_buddies(self):
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":582
+ *         @return Account's buddies list
+ *         """
  *         cdef glib.GSList *iter = NULL             # <<<<<<<<<<<<<<
  *         cdef blist.PurpleBuddy *c_buddy = NULL
  *         cdef char *c_alias = NULL
@@ -17814,8 +17789,8 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, P
   __pyx_v_iter = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":582
- *     def get_buddies(self):
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":583
+ *         """
  *         cdef glib.GSList *iter = NULL
  *         cdef blist.PurpleBuddy *c_buddy = NULL             # <<<<<<<<<<<<<<
  *         cdef char *c_alias = NULL
@@ -17824,60 +17799,60 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, P
   __pyx_v_c_buddy = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":583
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":584
  *         cdef glib.GSList *iter = NULL
  *         cdef blist.PurpleBuddy *c_buddy = NULL
  *         cdef char *c_alias = NULL             # <<<<<<<<<<<<<<
  * 
- *         if self.__exists:
+ *         buddies_list = []
  */
   __pyx_v_c_alias = NULL;
 
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":585
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":586
  *         cdef char *c_alias = NULL
  * 
- *         if self.__exists:             # <<<<<<<<<<<<<<
+ *         buddies_list = []             # <<<<<<<<<<<<<<
+ *         if self.__exists:
  *             iter = blist.purple_find_buddies(self._get_structure(), NULL)
- * 
  */
-  __pyx_1 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  if (__pyx_1) {
+  __pyx_1 = PyList_New(0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 586; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(__pyx_v_buddies_list);
+  __pyx_v_buddies_list = ((PyObject *)__pyx_1);
+  __pyx_1 = 0;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":586
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":587
  * 
- *         if self.__exists:
- *             iter = blist.purple_find_buddies(self._get_structure(), NULL)             # <<<<<<<<<<<<<<
+ *         buddies_list = []
+ *         if self.__exists:             # <<<<<<<<<<<<<<
+ *             iter = blist.purple_find_buddies(self._get_structure(), NULL)
  * 
- *             buddies_list = []
  */
-    __pyx_v_iter = purple_find_buddies(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), NULL);
+  __pyx_2 = __Pyx_PyObject_IsTrue(((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__exists); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 587; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  if (__pyx_2) {
 
     /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":588
- *             iter = blist.purple_find_buddies(self._get_structure(), NULL)
+ *         buddies_list = []
+ *         if self.__exists:
+ *             iter = blist.purple_find_buddies(self._get_structure(), NULL)             # <<<<<<<<<<<<<<
  * 
- *             buddies_list = []             # <<<<<<<<<<<<<<
  *             while iter:
- *                 c_alias = NULL
  */
-    __pyx_2 = PyList_New(0); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 588; __pyx_clineno = __LINE__; goto __pyx_L1;}
-    Py_DECREF(__pyx_v_buddies_list);
-    __pyx_v_buddies_list = ((PyObject *)__pyx_2);
-    __pyx_2 = 0;
+    __pyx_v_iter = purple_find_buddies(((struct __pyx_vtabstruct_6purple_Account *)((struct __pyx_obj_6purple_Account *)__pyx_v_self)->__pyx_vtab)->_get_structure(((struct __pyx_obj_6purple_Account *)__pyx_v_self)), NULL);
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":589
+    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":590
+ *             iter = blist.purple_find_buddies(self._get_structure(), NULL)
  * 
- *             buddies_list = []
  *             while iter:             # <<<<<<<<<<<<<<
  *                 c_alias = NULL
  *                 c_buddy = <blist.PurpleBuddy *> iter.data
  */
     while (1) {
-      __pyx_1 = (__pyx_v_iter != 0);
-      if (!__pyx_1) break;
+      __pyx_2 = (__pyx_v_iter != 0);
+      if (!__pyx_2) break;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":590
- *             buddies_list = []
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":591
+ * 
  *             while iter:
  *                 c_alias = NULL             # <<<<<<<<<<<<<<
  *                 c_buddy = <blist.PurpleBuddy *> iter.data
@@ -17885,7 +17860,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, P
  */
       __pyx_v_c_alias = NULL;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":591
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":592
  *             while iter:
  *                 c_alias = NULL
  *                 c_buddy = <blist.PurpleBuddy *> iter.data             # <<<<<<<<<<<<<<
@@ -17894,37 +17869,37 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, P
  */
       __pyx_v_c_buddy = ((PurpleBuddy *)__pyx_v_iter->data);
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":593
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":594
  *                 c_buddy = <blist.PurpleBuddy *> iter.data
  * 
  *                 name = <char *> blist.purple_buddy_get_name(c_buddy)             # <<<<<<<<<<<<<<
  *                 new_buddy = Buddy(name, self)
  * 
  */
-      __pyx_2 = __Pyx_PyBytes_FromString(((char *)purple_buddy_get_name(__pyx_v_c_buddy))); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 593; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_1 = __Pyx_PyBytes_FromString(((char *)purple_buddy_get_name(__pyx_v_c_buddy))); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_DECREF(__pyx_v_name);
-      __pyx_v_name = __pyx_2;
-      __pyx_2 = 0;
+      __pyx_v_name = __pyx_1;
+      __pyx_1 = 0;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":594
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":595
  * 
  *                 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)
  */
-      __pyx_2 = PyTuple_New(2); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      __pyx_1 = PyTuple_New(2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 595; __pyx_clineno = __LINE__; goto __pyx_L1;}
       Py_INCREF(__pyx_v_name);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_name);
+      PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_name);
       Py_INCREF(__pyx_v_self);
-      PyTuple_SET_ITEM(__pyx_2, 1, __pyx_v_self);
-      __pyx_3 = PyObject_Call(((PyObject*)__pyx_ptype_6purple_Buddy), ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1;}
-      Py_DECREF(((PyObject *)__pyx_2)); __pyx_2 = 0;
+      PyTuple_SET_ITEM(__pyx_1, 1, __pyx_v_self);
+      __pyx_3 = PyObject_Call(((PyObject*)__pyx_ptype_6purple_Buddy), ((PyObject *)__pyx_1), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 595; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
       Py_DECREF(__pyx_v_new_buddy);
       __pyx_v_new_buddy = __pyx_3;
       __pyx_3 = 0;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":596
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":597
  *                 new_buddy = Buddy(name, self)
  * 
  *                 c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)             # <<<<<<<<<<<<<<
@@ -17933,87 +17908,74 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, P
  */
       __pyx_v_c_alias = ((char *)purple_buddy_get_alias_only(__pyx_v_c_buddy));
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":597
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":598
  * 
  *                 c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)
  *                 if c_alias:             # <<<<<<<<<<<<<<
  *                     new_buddy.set_alias(c_alias)
  * 
  */
-      __pyx_1 = (__pyx_v_c_alias != 0);
-      if (__pyx_1) {
+      __pyx_2 = (__pyx_v_c_alias != 0);
+      if (__pyx_2) {
 
-        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":598
+        /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":599
  *                 c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)
  *                 if c_alias:
  *                     new_buddy.set_alias(c_alias)             # <<<<<<<<<<<<<<
  * 
  *                 buddies_list.append(new_buddy)
  */
-        __pyx_2 = PyObject_GetAttr(__pyx_v_new_buddy, __pyx_kp_set_alias); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L1;}
-        __pyx_3 = __Pyx_PyBytes_FromString(__pyx_v_c_alias); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L1;}
-        __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        __pyx_1 = PyObject_GetAttr(__pyx_v_new_buddy, __pyx_kp_set_alias); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        __pyx_3 = __Pyx_PyBytes_FromString(__pyx_v_c_alias); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L1;}
         PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3);
         __pyx_3 = 0;
-        __pyx_3 = PyObject_Call(__pyx_2, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L1;}
-        Py_DECREF(__pyx_2); __pyx_2 = 0;
+        __pyx_3 = PyObject_Call(__pyx_1, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 599; __pyx_clineno = __LINE__; goto __pyx_L1;}
+        Py_DECREF(__pyx_1); __pyx_1 = 0;
         Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
         Py_DECREF(__pyx_3); __pyx_3 = 0;
         goto __pyx_L7;
       }
       __pyx_L7:;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":600
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":601
  *                     new_buddy.set_alias(c_alias)
  * 
  *                 buddies_list.append(new_buddy)             # <<<<<<<<<<<<<<
  *                 iter = iter.next
- *             return buddies_list
+ * 
  */
-      __pyx_2 = __Pyx_PyObject_Append(__pyx_v_buddies_list, __pyx_v_new_buddy); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 600; __pyx_clineno = __LINE__; goto __pyx_L1;}
-      Py_DECREF(__pyx_2); __pyx_2 = 0;
+      __pyx_1 = __Pyx_PyObject_Append(__pyx_v_buddies_list, __pyx_v_new_buddy); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L1;}
+      Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":601
+      /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":602
  * 
  *                 buddies_list.append(new_buddy)
  *                 iter = iter.next             # <<<<<<<<<<<<<<
- *             return buddies_list
- *         else:
+ * 
+ *         return buddies_list
  */
       __pyx_v_iter = __pyx_v_iter->next;
     }
-
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":602
- *                 buddies_list.append(new_buddy)
- *                 iter = iter.next
- *             return buddies_list             # <<<<<<<<<<<<<<
- *         else:
- *             return None
- */
-    Py_INCREF(__pyx_v_buddies_list);
-    __pyx_r = __pyx_v_buddies_list;
-    goto __pyx_L0;
     goto __pyx_L4;
   }
-  /*else*/ {
+  __pyx_L4:;
 
-    /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":604
- *             return buddies_list
- *         else:
- *             return None             # <<<<<<<<<<<<<<
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":604
+ *                 iter = iter.next
+ * 
+ *         return buddies_list             # <<<<<<<<<<<<<<
  * 
  *     def request_add_buddy(self, buddy_username, buddy_alias):
  */
-    Py_INCREF(Py_None);
-    __pyx_r = Py_None;
-    goto __pyx_L0;
-  }
-  __pyx_L4:;
+  Py_INCREF(__pyx_v_buddies_list);
+  __pyx_r = __pyx_v_buddies_list;
+  goto __pyx_L0;
 
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
-  Py_XDECREF(__pyx_2);
+  Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_3);
   Py_XDECREF(__pyx_4);
   __Pyx_AddTraceback("purple.Account.get_buddies");
@@ -18026,7 +17988,7 @@ static PyObject *__pyx_pf_6purple_7Account_get_buddies(PyObject *__pyx_v_self, P
 }
 
 /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":606
- *             return None
+ *         return buddies_list
  * 
  *     def request_add_buddy(self, buddy_username, buddy_alias):             # <<<<<<<<<<<<<<
  *         if buddy_alias:
@@ -21893,7 +21855,7 @@ static struct PyMethodDef __pyx_methods_6purple_Account[] = {
   {"add_buddy", (PyCFunction)__pyx_pf_6purple_7Account_add_buddy, METH_VARARGS|METH_KEYWORDS, __pyx_doc_6purple_7Account_add_buddy},
   {"remove_buddy", (PyCFunction)__pyx_pf_6purple_7Account_remove_buddy, METH_O, __pyx_doc_6purple_7Account_remove_buddy},
   {"get_buddies_online", (PyCFunction)__pyx_pf_6purple_7Account_get_buddies_online, METH_NOARGS, 0},
-  {"get_buddies", (PyCFunction)__pyx_pf_6purple_7Account_get_buddies, METH_NOARGS, 0},
+  {"get_buddies", (PyCFunction)__pyx_pf_6purple_7Account_get_buddies, METH_NOARGS, __pyx_doc_6purple_7Account_get_buddies},
   {"request_add_buddy", (PyCFunction)__pyx_pf_6purple_7Account_request_add_buddy, METH_VARARGS|METH_KEYWORDS, 0},
   {"set_active_status", (PyCFunction)__pyx_pf_6purple_7Account_set_active_status, METH_VARARGS|METH_KEYWORDS, 0},
   {"set_status_message", (PyCFunction)__pyx_pf_6purple_7Account_set_status_message, METH_VARARGS|METH_KEYWORDS, 0},
@@ -23052,36 +23014,36 @@ PyMODINIT_FUNC initpurple(void) {
   if (PyDict_SetItem((PyObject *)__pyx_ptype_6purple_Account->tp_dict, __pyx_kp_enabled, __pyx_1) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1;}
   __Pyx_TypeModified(__pyx_ptype_6purple_Account);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":244
- *              return None
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":243
+ *         return status_types
  * 
  *     status_types = property(__get_status_types)             # <<<<<<<<<<<<<<
  * 
  *     def __get_active_status(self):
  */
-  __pyx_2 = __Pyx_GetName((PyObject *)__pyx_ptype_6purple_Account, __pyx_kp___get_status_types); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  __pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName((PyObject *)__pyx_ptype_6purple_Account, __pyx_kp___get_status_types); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 243; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 243; __pyx_clineno = __LINE__; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2);
   __pyx_2 = 0;
-  __pyx_2 = PyObject_Call(__pyx_builtin_property, ((PyObject *)__pyx_1), NULL); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_builtin_property, ((PyObject *)__pyx_1), NULL); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 243; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
-  if (PyDict_SetItem((PyObject *)__pyx_ptype_6purple_Account->tp_dict, __pyx_kp_status_types, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  if (PyDict_SetItem((PyObject *)__pyx_ptype_6purple_Account->tp_dict, __pyx_kp_status_types, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 243; __pyx_clineno = __LINE__; goto __pyx_L1;}
   __Pyx_TypeModified(__pyx_ptype_6purple_Account);
 
-  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":267
+  /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/account.pyx":266
  *         else:
  *             return None
  *     active_status = property(__get_active_status)             # <<<<<<<<<<<<<<
  * 
  *     def set_username(self, username):
  */
-  __pyx_1 = __Pyx_GetName((PyObject *)__pyx_ptype_6purple_Account, __pyx_kp___get_active_status); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = __Pyx_GetName((PyObject *)__pyx_ptype_6purple_Account, __pyx_kp___get_active_status); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_Call(__pyx_builtin_property, ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_builtin_property, ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_2)); __pyx_2 = 0;
-  if (PyDict_SetItem((PyObject *)__pyx_ptype_6purple_Account->tp_dict, __pyx_kp_active_status, __pyx_1) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  if (PyDict_SetItem((PyObject *)__pyx_ptype_6purple_Account->tp_dict, __pyx_kp_active_status, __pyx_1) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1;}
   __Pyx_TypeModified(__pyx_ptype_6purple_Account);
 
   /* "/opt/wrk/indt/workspace/git-svn/carman/python-purple/buddy.pyx":49