Merge call branch from Elliot Fairweather with cleanups from Xavier Claessens.

[empathy.git] / python / pyempathy / pyempathy.override

diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index 82433927300f60482d5c3485cbb299e0668c9575..7a7e6820d944bb300591002d1d0d299827cbfb5f 100644 (file)
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -6,7 +6,7 @@ headers
 #include "empathy-chandler.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-chatroom.h"
-#include "empathy-conf.h"
+#include "empathy-contact-groups.h"
 #include "empathy-contact-list.h"
 #include "empathy-contact-manager.h"
 #include "empathy-contact.h"
@@ -14,23 +14,19 @@ headers
 #include "empathy-filter.h"
 #include "empathy-idle.h"
 #include "empathy-log-manager.h"
-#include "empathy-marshal.h"
 #include "empathy-message.h"
-#include "empathy-presence.h"
+#include "empathy-status-presets.h"
 #include "empathy-time.h"
+#include "empathy-tp-call.h"
 #include "empathy-tp-chat.h"
 #include "empathy-tp-chatroom.h"
+#include "empathy-tp-contact-factory.h"
 #include "empathy-tp-contact-list.h"
 #include "empathy-tp-group.h"
+#include "empathy-tp-roomlist.h"
 #include "empathy-utils.h"
-
-
-/* FIXME */
-#define MC_TYPE_PRESENCE 1
-#define EMPATHY_TYPE_SUBSCRIPTION 2
-#define EMPATHY_TYPE_MESSAGE_TYPE 3
-#define EMPATHY_TYPE_REG_EX_TYPE 4
-
+#include "empathy-contact-factory.h"
+#include "empathy-enum-types.h"
 
 void empathy_add_constants(PyObject *module, const gchar *strip_prefix);
 void empathy_register_classes(PyObject *d);
@@ -63,22 +59,3 @@ _wrap_empathy_contact_list_get_members(PyGObject *self, PyObject *args, PyObject
 
 }
 %%
-override empathy_contact_get_groups kwargs
-static PyObject *
-_wrap_empathy_contact_get_groups(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-
-       GList *groups = empathy_contact_get_groups(EMPATHY_CONTACT(self->obj));
-       PyObject *py_groups = PyList_New(0);
-       GList *l;
-
-       for(l = groups; l; l = l->next) {
-               const gchar *group;
-               group = l->data;
-               PyList_Append(py_groups, PyString_FromString(group));
-       }
-
-       return py_groups;
-
-}
-%%