switch empathy-contact to Collabora coding style (Guillaume Desmottes)

svn path=/trunk/; revision=1214

1 files changed, 55 insertions, 62 deletions

diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 987744811..697781ac4 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -43,21 +43,23 @@ G_BEGIN_DECLS
 typedef struct _EmpathyContact      EmpathyContact;
 typedef struct _EmpathyContactClass EmpathyContactClass;
 
-struct _EmpathyContact {
+struct _EmpathyContact
+{
 	GObject parent;
 	gpointer priv;
 };
 
-struct _EmpathyContactClass {
+struct _EmpathyContactClass
+{
 	GObjectClass parent_class;
 };
 
 typedef struct {
 	guchar *data;
-	gsize   len;
-	gchar  *format;
-	gchar  *token;
-	guint   refcount;
+	gsize len;
+	gchar *format;
+	gchar *token;
+	guint refcount;
 } EmpathyAvatar;
 
 typedef enum {
@@ -75,64 +77,55 @@ typedef enum {
 	EMPATHY_CONTACT_READY_ALL = (1 << 3) - 1,
 } EmpathyContactReady;
 
-GType               empathy_contact_get_type           (void) G_GNUC_CONST;
-EmpathyContact *    empathy_contact_new                (McAccount           *account);
-EmpathyContact *    empathy_contact_new_full           (McAccount           *account,
-							const gchar         *id,
-							const gchar         *name);
-const gchar *       empathy_contact_get_id             (EmpathyContact      *contact);
-void                empathy_contact_set_id             (EmpathyContact      *contact,
-							const gchar         *id);
-const gchar *       empathy_contact_get_name           (EmpathyContact      *contact);
-void                empathy_contact_set_name           (EmpathyContact      *contact,
-							const gchar         *name);
-EmpathyAvatar *     empathy_contact_get_avatar         (EmpathyContact      *contact);
-void                empathy_contact_set_avatar         (EmpathyContact      *contact,
-							EmpathyAvatar       *avatar);
-McAccount *         empathy_contact_get_account        (EmpathyContact      *contact);
-void                empathy_contact_set_account        (EmpathyContact      *contact,
-							McAccount           *account);
-McPresence          empathy_contact_get_presence       (EmpathyContact      *contact);
-void                empathy_contact_set_presence       (EmpathyContact      *contact,
-							McPresence           presence);
-const gchar *       empathy_contact_get_presence_message (EmpathyContact    *contact);
-void                empathy_contact_set_presence_message (EmpathyContact    *contact,
-							const gchar         *message);
-guint               empathy_contact_get_handle         (EmpathyContact      *contact);
-void                empathy_contact_set_handle         (EmpathyContact      *contact,
-							guint                handle);
-EmpathyCapabilities empathy_contact_get_capabilities   (EmpathyContact      *contact);
-void                empathy_contact_set_capabilities   (EmpathyContact      *contact,
-							EmpathyCapabilities  capabilities);
-EmpathyContactReady empathy_contact_get_ready          (EmpathyContact      *contact);
-gboolean            empathy_contact_is_user            (EmpathyContact      *contact);
-void                empathy_contact_set_is_user        (EmpathyContact      *contact,
-							gboolean             is_user);
-gboolean            empathy_contact_is_online          (EmpathyContact      *contact);
-const gchar *       empathy_contact_get_status         (EmpathyContact      *contact);
-gboolean            empathy_contact_can_voip           (EmpathyContact      *contact);
-gboolean            empathy_contact_equal              (gconstpointer        v1,
-							gconstpointer        v2);
-guint               empathy_contact_hash               (gconstpointer        key);
-void                empathy_contact_run_until_ready    (EmpathyContact      *contact,
-							EmpathyContactReady  ready,
-							GMainLoop          **loop);
-void                empathy_contact_load_avatar_data   (EmpathyContact      *contact,
-							const guchar        *data,
-							const gsize          len,
-							const gchar         *format,
-							const gchar         *token);
-gboolean            empathy_contact_load_avatar_cache  (EmpathyContact      *contact,
-							const gchar         *token);
+GType empathy_contact_get_type (void) G_GNUC_CONST;
+EmpathyContact * empathy_contact_new (McAccount *account);
+EmpathyContact * empathy_contact_new_full (McAccount *account, const gchar *id,
+    const gchar *name);
+const gchar * empathy_contact_get_id (EmpathyContact *contact);
+void empathy_contact_set_id (EmpathyContact *contact, const gchar *id);
+const gchar * empathy_contact_get_name (EmpathyContact *contact);
+void empathy_contact_set_name (EmpathyContact *contact, const gchar *name);
+EmpathyAvatar * empathy_contact_get_avatar (EmpathyContact *contact);
+void empathy_contact_set_avatar (EmpathyContact *contact,
+    EmpathyAvatar *avatar);
+McAccount * empathy_contact_get_account (EmpathyContact *contact);
+void empathy_contact_set_account (EmpathyContact *contact, McAccount *account);
+McPresence empathy_contact_get_presence (EmpathyContact *contact);
+void empathy_contact_set_presence (EmpathyContact *contact,
+    McPresence presence);
+const gchar * empathy_contact_get_presence_message (EmpathyContact *contact);
+void empathy_contact_set_presence_message (EmpathyContact *contact,
+    const gchar *message);
+guint empathy_contact_get_handle (EmpathyContact *contact);
+void empathy_contact_set_handle (EmpathyContact *contact, guint handle);
+EmpathyCapabilities empathy_contact_get_capabilities (EmpathyContact *contact);
+void empathy_contact_set_capabilities (EmpathyContact *contact,
+    EmpathyCapabilities capabilities);
+EmpathyContactReady empathy_contact_get_ready (EmpathyContact *contact);
+gboolean empathy_contact_is_user (EmpathyContact *contact);
+void empathy_contact_set_is_user (EmpathyContact *contact,
+    gboolean is_user);
+gboolean empathy_contact_is_online (EmpathyContact *contact);
+const gchar * empathy_contact_get_status (EmpathyContact *contact);
+gboolean empathy_contact_can_voip (EmpathyContact *contact);
+gboolean empathy_contact_equal (gconstpointer v1, gconstpointer v2);
+guint empathy_contact_hash (gconstpointer key);
+void empathy_contact_run_until_ready (EmpathyContact *contact,
+    EmpathyContactReady ready, GMainLoop **loop);
+void empathy_contact_load_avatar_data (EmpathyContact *contact,
+    const guchar *data, const gsize len, const gchar *format,
+    const gchar *token);
+gboolean empathy_contact_load_avatar_cache (EmpathyContact *contact,
+    const gchar *token);
 
 #define EMPATHY_TYPE_AVATAR (empathy_avatar_get_type ())
-GType               empathy_avatar_get_type            (void) G_GNUC_CONST;
-EmpathyAvatar *     empathy_avatar_new                 (guchar              *data,
-							gsize                len,
-							gchar               *format,
-							gchar               *token);
-EmpathyAvatar *     empathy_avatar_ref                 (EmpathyAvatar       *avatar);
-void                empathy_avatar_unref               (EmpathyAvatar       *avatar);
+GType empathy_avatar_get_type (void) G_GNUC_CONST;
+EmpathyAvatar * empathy_avatar_new (guchar *data,
+							gsize len,
+							gchar *format,
+							gchar *token);
+EmpathyAvatar * empathy_avatar_ref (EmpathyAvatar *avatar);
+void empathy_avatar_unref (EmpathyAvatar *avatar);
 
 gboolean empathy_avatar_save_to_file (EmpathyAvatar *avatar,
     const gchar *filename, GError **error);