Merge branch 'gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-roster-model.c

diff --git a/libempathy-gtk/empathy-roster-model.c b/libempathy-gtk/empathy-roster-model.c
index 80a82bf1d5740976ad2b4510059d6f07b5b9a648..994ab9896435704e67196468d7a48ebce9d3b410 100644 (file)
--- a/libempathy-gtk/empathy-roster-model.c
+++ b/libempathy-gtk/empathy-roster-model.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include "config.h"
-
 #include "empathy-roster-model.h"
 
 G_DEFINE_INTERFACE (EmpathyRosterModel, empathy_roster_model, G_TYPE_OBJECT)
@@ -85,7 +84,8 @@ empathy_roster_model_fire_groups_changed (EmpathyRosterModel *self,
     const gchar *group,
     gboolean is_member)
 {
-  g_signal_emit (self, signals[SIG_GROUPS_CHANGED], 0, individual, group, is_member);
+  g_signal_emit (self, signals[SIG_GROUPS_CHANGED], 0, individual, group,
+      is_member);
 }
 
 /***** Public *****/
@@ -112,17 +112,17 @@ 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
  *
  * Returns the groups of which @individual is a member of.
  *
- * Returns: (transfer container): a #GList of (const gchar *) representing the
+ * Returns: (transfer full): a #GList of (gchar *) representing the
  * 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;
@@ -130,7 +130,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);
 }