aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-08 21:30:57 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-15 16:28:40 +0800
commit2f6934c6f206596cfffe0497adad83a231cc24d7 (patch)
tree13c5784889f41bfbed42c2efe7a7a563dc2964ba /libempathy
parent5056bda77944ccee7a6bc4040a462590c16982b3 (diff)
downloadgsoc2013-empathy-2f6934c6f206596cfffe0497adad83a231cc24d7.tar
gsoc2013-empathy-2f6934c6f206596cfffe0497adad83a231cc24d7.tar.gz
gsoc2013-empathy-2f6934c6f206596cfffe0497adad83a231cc24d7.tar.bz2
gsoc2013-empathy-2f6934c6f206596cfffe0497adad83a231cc24d7.tar.lz
gsoc2013-empathy-2f6934c6f206596cfffe0497adad83a231cc24d7.tar.xz
gsoc2013-empathy-2f6934c6f206596cfffe0497adad83a231cc24d7.tar.zst
gsoc2013-empathy-2f6934c6f206596cfffe0497adad83a231cc24d7.zip
coding style fixes
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-contact-list.c12
-rw-r--r--libempathy/empathy-contact-list.h8
-rw-r--r--libempathy/empathy-contact-manager.c32
3 files changed, 27 insertions, 25 deletions
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index 7bd00474f..0a3d361d4 100644
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -266,11 +266,11 @@ empathy_contact_list_is_favourite (EmpathyContactList *list,
#if HAVE_FAVOURITE_CONTACTS
if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->is_favourite) {
return EMPATHY_CONTACT_LIST_GET_IFACE (list)->is_favourite (
- list, contact);
+ list, contact);
}
#endif /* HAVE_FAVOURITE_CONTACTS */
- return FALSE;
+ return FALSE;
}
void
@@ -279,8 +279,8 @@ empathy_contact_list_add_to_favourites (EmpathyContactList *list,
{
#if HAVE_FAVOURITE_CONTACTS
if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_favourite) {
- EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_favourite (list,
- contact);
+ EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_favourite (list,
+ contact);
}
#endif /* HAVE_FAVOURITE_CONTACTS */
}
@@ -291,8 +291,8 @@ empathy_contact_list_remove_from_favourites (EmpathyContactList *list,
{
#if HAVE_FAVOURITE_CONTACTS
if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_favourite) {
- EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_favourite (list,
- contact);
+ EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_favourite (list,
+ contact);
}
#endif /* HAVE_FAVOURITE_CONTACTS */
}
diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h
index 6d9427d99..8d2f445e1 100644
--- a/libempathy/empathy-contact-list.h
+++ b/libempathy/empathy-contact-list.h
@@ -78,7 +78,7 @@ struct _EmpathyContactListIface {
void (*add_favourite) (EmpathyContactList *list,
EmpathyContact *contact);
void (*remove_favourite) (EmpathyContactList *list,
- EmpathyContact *contact);
+ EmpathyContact *contact);
};
GType empathy_contact_list_get_type (void) G_GNUC_CONST;
@@ -111,14 +111,14 @@ EmpathyContactListFlags
empathy_contact_list_get_flags (EmpathyContactList *list);
gboolean empathy_contact_list_is_favourite (EmpathyContactList *list,
- EmpathyContact *contact);
+ EmpathyContact *contact);
void empathy_contact_list_add_to_favourites (EmpathyContactList *list,
- EmpathyContact *contact);
+ EmpathyContact *contact);
void empathy_contact_list_remove_from_favourites
(EmpathyContactList *list,
- EmpathyContact *contact);
+ EmpathyContact *contact);
G_END_DECLS
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 255387b7c..b02b00a84 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -225,7 +225,7 @@ contact_manager_is_favourite (EmpathyContactList *manager,
static void
contact_manager_add_favourite (EmpathyContactList *manager,
- EmpathyContact *contact)
+ EmpathyContact *contact)
{
EmpathyContactManagerPriv *priv;
TpAccount *account;
@@ -247,7 +247,7 @@ contact_manager_add_favourite (EmpathyContactList *manager,
static void
contact_manager_remove_favourite (EmpathyContactList *manager,
- EmpathyContact *contact)
+ EmpathyContact *contact)
{
EmpathyContactManagerPriv *priv;
TpAccount *account;
@@ -269,7 +269,7 @@ contact_manager_remove_favourite (EmpathyContactList *manager,
static void
logger_favourite_contacts_add_from_value_array (GValueArray *va,
- EmpathyContactManager *manager)
+ EmpathyContactManager *manager)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
guint i;
@@ -316,7 +316,7 @@ logger_favourite_contacts_get_cb (TpProxy *proxy,
EmpathyContactManager *manager = EMPATHY_CONTACT_MANAGER (user_data);
if (error == NULL) {
- g_ptr_array_foreach ((GPtrArray*) result,
+ g_ptr_array_foreach ((GPtrArray *) result,
(GFunc)
logger_favourite_contacts_add_from_value_array,
manager);
@@ -446,8 +446,8 @@ account_manager_prepared_cb (GObject *source_object,
static EmpathyContact *
contact_manager_lookup_contact (EmpathyContactManager *manager,
- const gchar *account_name,
- const gchar *contact_id)
+ const gchar *account_name,
+ const gchar *contact_id)
{
EmpathyContact *retval = NULL;
GList *members, *l;
@@ -479,11 +479,11 @@ contact_manager_lookup_contact (EmpathyContactManager *manager,
static void
logger_favourite_contacts_changed_cb (TpProxy *proxy,
- const gchar *account_name,
- const gchar **added,
- const gchar **removed,
- gpointer user_data,
- GObject *weak_object)
+ const gchar *account_name,
+ const gchar **added,
+ const gchar **removed,
+ gpointer user_data,
+ GObject *weak_object)
{
EmpathyContactManagerPriv *priv;
EmpathyContactManager *manager = EMPATHY_CONTACT_MANAGER (weak_object);
@@ -559,10 +559,12 @@ empathy_contact_manager_init (EmpathyContactManager *manager)
empathy_proxy_equal,
(GDestroyNotify) g_object_unref,
(GDestroyNotify) g_object_unref);
- priv->favourites = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify)
- g_hash_table_unref);
+
+ priv->favourites = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify)
+ g_hash_table_unref);
+
priv->account_manager = tp_account_manager_dup ();
priv->contact_monitor = NULL;