rename empathy_roster_model_get_groups_for_individual() to _dup_

It matches tp-glib naming convention now that the returned list is (transfer
full).

diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c
index b0b68449a66306fe987bab0bf14dd01f321f2906..a11a69d396f66af9cf11034692c55729c07d042e 100644 (file)
--- 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 3738c7fcd6ddfbf37d2776fadfd45ac0a872344b..896923fbb9204b245ac994bcea3cf3e043190c9e 100644 (file)
--- 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 a7f094e3ff2f5e970df43260a4b24cab9726d2ad..3fd84b7fcfd4d7b82806f247796208e90a193008 100644 (file)
--- 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 dd8288eca5d6309c9464587652134d0b4d459236..27c5482f3ba39d2891268d51b4843e04ee8eed6d 100644 (file)
--- 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 b5f2ccd074fd42840c1c21064534a93dc5562b6b..d54bd052c7a0a2d404a17ebd7507655d27aa189a 100644 (file)
--- 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,