[folks: 1/3] Make some Persona instances unowned
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks: 1/3] Make some Persona instances unowned
- Date: Thu, 15 Jul 2010 20:45:24 +0000 (UTC)
commit b03cf7ba64fc9270f657e3b8fa4e0c066d985ab5
Author: Philip Withnall <philip withnall collabora co uk>
Date: Thu Jul 15 12:59:43 2010 +0100
Make some Persona instances unowned
In trivial cases where we're iterating through a list of owned Personas, there
is no need to ref/unref for each iteration. This makes debugging refcount
issues a lot easier.
folks/individual-aggregator.vala | 2 +-
folks/individual.vala | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index f21a237..4282017 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -143,7 +143,7 @@ public class Folks.IndividualAggregator : Object
var individuals = new GLib.List<Individual> ();
added.foreach ((persona) =>
{
- var p = (Persona) persona;
+ unowned Persona p = (Persona) persona;
/* FIXME: correlate the new personas with each other and
* the existing personas and existing Individuals;
diff --git a/folks/individual.vala b/folks/individual.vala
index 26652d6..332ce13 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -157,8 +157,8 @@ public class Folks.Individual : Object,
/* Disconnect from all our previous personas */
this._personas.foreach ((p) =>
{
- var persona = (Persona) p;
- var groups = (p is Groups) ? (Groups) p : null;
+ unowned Persona persona = (Persona) p;
+ unowned Groups groups = (p is Groups) ? (Groups) p : null;
persona.notify["alias"].disconnect (this.notify_alias_cb);
persona.notify["avatar"].disconnect (this.notify_avatar_cb);
@@ -194,8 +194,8 @@ public class Folks.Individual : Object,
/* Connect to all the new personas */
this._personas.foreach ((p) =>
{
- var persona = (Persona) p;
- var groups = (p is Groups) ? (Groups) p : null;
+ unowned Persona persona = (Persona) p;
+ unowned Groups groups = (p is Groups) ? (Groups) p : null;
persona.notify["alias"].connect (this.notify_alias_cb);
persona.notify["avatar"].connect (this.notify_avatar_cb);
@@ -290,7 +290,7 @@ public class Folks.Individual : Object,
{
this._personas.foreach ((p) =>
{
- var persona = (Persona) p;
+ unowned Persona persona = (Persona) p;
var store_is_new = false;
var persona_set = this.stores.lookup (persona.store);
if (persona_set == null)
@@ -349,7 +349,7 @@ public class Folks.Individual : Object,
var persona_set = this.stores.lookup (store);
removed.foreach ((data) =>
{
- var p = (Persona) data;
+ unowned Persona p = (Persona) data;
persona_set.remove (p);
this._personas.remove (p);
@@ -392,7 +392,7 @@ public class Folks.Individual : Object,
{
if (p is Groups)
{
- var persona = (Groups) p;
+ unowned Groups persona = (Groups) p;
persona.groups.foreach ((k, v) =>
{
@@ -444,7 +444,7 @@ public class Folks.Individual : Object,
{
if (p is Presence)
{
- var presence = (Presence) p;
+ unowned Presence presence = (Presence) p;
if (Presence.typecmp (presence.presence_type, presence_type) > 0)
{
@@ -492,7 +492,7 @@ public class Folks.Individual : Object,
{
if (p is Alias)
{
- var a = (Alias) p;
+ unowned Alias a = (Alias) p;
if (alias == null && a.alias != null && a.alias.strip () != "")
alias = a.alias;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]