aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
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-gtk
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-gtk')
-rw-r--r--libempathy-gtk/empathy-contact-list-store.c33
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c20
2 files changed, 27 insertions, 26 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index ca776682f..38fbfa5c5 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -930,18 +930,18 @@ contact_list_store_members_changed_cb (EmpathyContactList *list_iface,
static void
contact_list_store_change_contact_favourite_status (EmpathyContactListStore *store,
- EmpathyContact *contact,
- gboolean is_favourite)
+ EmpathyContact *contact,
+ gboolean is_favourite)
{
- GList *iters, *l;
+ GList *iters, *l;
iters = contact_list_store_find_contact (store, contact);
- for (l = iters; l; l = l->next) {
+ for (l = iters; l; l = l->next) {
gtk_tree_store_set (GTK_TREE_STORE (store), l->data,
- EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE,
- is_favourite,
- -1);
- }
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE,
+ is_favourite,
+ -1);
+ }
g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
g_list_free (iters);
@@ -949,9 +949,9 @@ contact_list_store_change_contact_favourite_status (EmpathyContactListStore *sto
static void
contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
- EmpathyContact *contact,
- gboolean is_favourite,
- EmpathyContactListStore *store)
+ EmpathyContact *contact,
+ gboolean is_favourite,
+ EmpathyContactListStore *store)
{
EmpathyContactListStorePriv *priv;
@@ -962,7 +962,8 @@ contact_list_store_favourites_changed_cb (EmpathyContactList *list_iface,
empathy_contact_get_handle (contact),
is_favourite ? "now" : "no longer");
- contact_list_store_change_contact_favourite_status (store, contact, is_favourite);
+ contact_list_store_change_contact_favourite_status (store, contact,
+ is_favourite);
}
static void
@@ -1550,9 +1551,9 @@ contact_list_store_state_sort_func (GtkTreeModel *model,
/* Separator, favourites group, or other group? */
if (is_separator_a || is_separator_b) {
if (is_separator_a) {
- ret_val = -1;
+ ret_val = -1;
} else if (is_separator_b) {
- ret_val = 1;
+ ret_val = 1;
}
} else if (is_favourite_a && !is_favourite_b) {
ret_val = -1;
@@ -1627,9 +1628,9 @@ contact_list_store_name_sort_func (GtkTreeModel *model,
if (is_separator_a || is_separator_b) {
if (is_separator_a) {
- ret_val = -1;
+ ret_val = -1;
} else if (is_separator_b) {
- ret_val = 1;
+ ret_val = 1;
}
} else if (is_favourite_a && !is_favourite_b) {
ret_val = -1;
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index b95f05580..8fb08dfdc 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -828,7 +828,7 @@ contact_list_view_favourite_toggled_cb (
GtkTreeModel *model;
GtkTreeIter iter;
EmpathyContact *contact;
- EmpathyContactList *list;
+ EmpathyContactList *list;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string))
@@ -840,12 +840,12 @@ contact_list_view_favourite_toggled_cb (
if (contact == NULL)
return;
- list = empathy_contact_list_store_get_list_iface (priv->store);
- if (empathy_contact_list_is_favourite (list, contact)) {
- empathy_contact_list_remove_from_favourites (list, contact);
- } else {
- empathy_contact_list_add_to_favourites (list, contact);
- }
+ list = empathy_contact_list_store_get_list_iface (priv->store);
+ if (empathy_contact_list_is_favourite (list, contact)) {
+ empathy_contact_list_remove_from_favourites (list, contact);
+ } else {
+ empathy_contact_list_add_to_favourites (list, contact);
+ }
g_object_unref (contact);
}
@@ -1055,9 +1055,9 @@ contact_list_view_favourite_cell_data_func (
EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE, &is_favourite,
-1);
- if (!is_separator && !is_group)
- icon_name = (is_favourite? EMPATHY_IMAGE_FAVOURITE :
- EMPATHY_IMAGE_UNFAVOURITE);
+ if (!is_separator && !is_group)
+ icon_name = (is_favourite? EMPATHY_IMAGE_FAVOURITE :
+ EMPATHY_IMAGE_UNFAVOURITE);
g_object_set (cell,
"visible", (icon_name != NULL),