aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-12 20:42:40 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-12 20:42:40 +0800
commit0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d (patch)
treeebd8339b7ceb24db21fe736a6bb136d7cd709f5e /libempathy-gtk
parent616f55e491686779b760b0726f237f13f36ccdbb (diff)
downloadgsoc2013-empathy-0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d.tar
gsoc2013-empathy-0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d.tar.gz
gsoc2013-empathy-0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d.tar.bz2
gsoc2013-empathy-0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d.tar.lz
gsoc2013-empathy-0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d.tar.xz
gsoc2013-empathy-0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d.tar.zst
gsoc2013-empathy-0e956cfcf66b23bd359c4fefbabd7288c1d2bd5d.zip
rename empathy_roster_model_get_groups_for_individual() to _dup_
It matches tp-glib naming convention now that the returned list is (transfer full).
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-roster-model-aggregator.c6
-rw-r--r--libempathy-gtk/empathy-roster-model-manager.c6
-rw-r--r--libempathy-gtk/empathy-roster-model.c8
-rw-r--r--libempathy-gtk/empathy-roster-model.h4
-rw-r--r--libempathy-gtk/empathy-roster-view.c4
5 files changed, 14 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c
index b0b68449a..a11a69d39 100644
--- a/libempathy-gtk/empathy-roster-model-aggregator.c
+++ b/libempathy-gtk/empathy-roster-model-aggregator.c
@@ -393,7 +393,7 @@ empathy_roster_model_aggregator_get_individuals (EmpathyRosterModel *model)
}
static GList *
-empathy_roster_model_aggregator_get_groups_for_individual (
+empathy_roster_model_aggregator_dup_groups_for_individual (
EmpathyRosterModel *model,
FolksIndividual *individual)
{
@@ -420,6 +420,6 @@ static void
roster_model_iface_init (EmpathyRosterModelInterface *iface)
{
iface->get_individuals = empathy_roster_model_aggregator_get_individuals;
- iface->get_groups_for_individual =
- empathy_roster_model_aggregator_get_groups_for_individual;
+ iface->dup_groups_for_individual =
+ empathy_roster_model_aggregator_dup_groups_for_individual;
}
diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index 3738c7fcd..896923fbb 100644
--- a/libempathy-gtk/empathy-roster-model-manager.c
+++ b/libempathy-gtk/empathy-roster-model-manager.c
@@ -363,7 +363,7 @@ empathy_roster_model_manager_get_individuals (EmpathyRosterModel *model)
}
static GList *
-empathy_roster_model_manager_get_groups_for_individual (
+empathy_roster_model_manager_dup_groups_for_individual (
EmpathyRosterModel *model,
FolksIndividual *individual)
{
@@ -402,6 +402,6 @@ static void
roster_model_iface_init (EmpathyRosterModelInterface *iface)
{
iface->get_individuals = empathy_roster_model_manager_get_individuals;
- iface->get_groups_for_individual =
- empathy_roster_model_manager_get_groups_for_individual;
+ iface->dup_groups_for_individual =
+ empathy_roster_model_manager_dup_groups_for_individual;
}
diff --git a/libempathy-gtk/empathy-roster-model.c b/libempathy-gtk/empathy-roster-model.c
index a7f094e3f..3fd84b7fc 100644
--- a/libempathy-gtk/empathy-roster-model.c
+++ b/libempathy-gtk/empathy-roster-model.c
@@ -113,7 +113,7 @@ empathy_roster_model_get_individuals (EmpathyRosterModel *self)
}
/**
- * empathy_roster_model_get_groups_for_individual:
+ * empathy_roster_model_dup_groups_for_individual:
* @self: a #EmpathyRosterModel
* @individual: a #FolksIndidivual
*
@@ -123,7 +123,7 @@ empathy_roster_model_get_individuals (EmpathyRosterModel *self)
* groups of @individual
*/
GList *
-empathy_roster_model_get_groups_for_individual (EmpathyRosterModel *self,
+empathy_roster_model_dup_groups_for_individual (EmpathyRosterModel *self,
FolksIndividual *individual)
{
EmpathyRosterModelInterface *iface;
@@ -131,7 +131,7 @@ empathy_roster_model_get_groups_for_individual (EmpathyRosterModel *self,
g_return_val_if_fail (EMPATHY_IS_ROSTER_MODEL (self), NULL);
iface = EMPATHY_ROSTER_MODEL_GET_IFACE (self);
- g_return_val_if_fail (iface->get_groups_for_individual != NULL, NULL);
+ g_return_val_if_fail (iface->dup_groups_for_individual != NULL, NULL);
- return (* iface->get_groups_for_individual) (self, individual);
+ return (* iface->dup_groups_for_individual) (self, individual);
}
diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h
index dd8288eca..27c5482f3 100644
--- a/libempathy-gtk/empathy-roster-model.h
+++ b/libempathy-gtk/empathy-roster-model.h
@@ -40,7 +40,7 @@ struct _EmpathyRosterModelInterface
/* Virtual table */
GList * (* get_individuals) (EmpathyRosterModel *self);
- GList * (*get_groups_for_individual) (EmpathyRosterModel *self,
+ GList * (*dup_groups_for_individual) (EmpathyRosterModel *self,
FolksIndividual *individual);
};
@@ -77,7 +77,7 @@ void empathy_roster_model_fire_groups_changed (EmpathyRosterModel *self,
/* Public API */
GList * empathy_roster_model_get_individuals (EmpathyRosterModel *self);
-GList * empathy_roster_model_get_groups_for_individual (
+GList * empathy_roster_model_dup_groups_for_individual (
EmpathyRosterModel *self,
FolksIndividual *individual);
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index b5f2ccd07..d54bd052c 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -393,7 +393,7 @@ individual_added (EmpathyRosterView *self,
{
GList *groups, *l;
- groups = empathy_roster_model_get_groups_for_individual (self->priv->model,
+ groups = empathy_roster_model_dup_groups_for_individual (self->priv->model,
individual);
if (g_list_length (groups) > 0)
@@ -588,7 +588,7 @@ contact_in_top (EmpathyRosterView *self,
individual = empathy_roster_contact_get_individual (contact);
- groups = empathy_roster_model_get_groups_for_individual (
+ groups = empathy_roster_model_dup_groups_for_individual (
self->priv->model, individual);
if (g_list_find_custom (groups, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP,