diff options
author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-11-04 18:32:45 +0000 |
---|---|---|
committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-11-15 16:50:44 +0000 |
commit | 7d15b1d218256edbb79aa5569cd82d7b6921f413 (patch) | |
tree | 3936601e30152167f4016a9f8317b683032cf8d2 /telepathy-glib/group-mixin.c | |
parent | 445b69e49022b9f42af4a76cf2c84e2e01697512 (diff) | |
download | telepathy-glib-7d15b1d218256edbb79aa5569cd82d7b6921f413.tar.gz |
use tp_handle_ref's new return type around source
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'telepathy-glib/group-mixin.c')
-rw-r--r-- | telepathy-glib/group-mixin.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/telepathy-glib/group-mixin.c b/telepathy-glib/group-mixin.c index 4dba0c473..c28c89cdc 100644 --- a/telepathy-glib/group-mixin.c +++ b/telepathy-glib/group-mixin.c @@ -122,13 +122,12 @@ local_pending_info_new (TpHandleRepoIface *repo, const gchar *message) { LocalPendingInfo *info = g_slice_new0 (LocalPendingInfo); - info->actor = actor; info->reason = reason; info->message = g_strdup (message); info->repo = repo; if (actor != 0) - tp_handle_ref (repo, actor); + info->actor = tp_handle_ref (repo, actor); return info; } @@ -310,10 +309,9 @@ tp_group_mixin_init (GObject *obj, mixin = TP_GROUP_MIXIN (obj); mixin->handle_repo = handle_repo; - mixin->self_handle = self_handle; - if (mixin->self_handle != 0) - tp_handle_ref (handle_repo, mixin->self_handle); + if (self_handle != 0) + mixin->self_handle = tp_handle_ref (handle_repo, self_handle); mixin->group_flags = 0; @@ -445,10 +443,11 @@ tp_group_mixin_change_self_handle (GObject *obj, DEBUG ("%u '%s'", new_self_handle, tp_handle_inspect (mixin->handle_repo, new_self_handle)); - if (new_self_handle != 0) - tp_handle_ref (mixin->handle_repo, new_self_handle); + mixin->self_handle = 0; - mixin->self_handle = new_self_handle; + if (new_self_handle != 0) + mixin->self_handle = tp_handle_ref (mixin->handle_repo, + new_self_handle); tp_svc_channel_interface_group_emit_self_handle_changed (obj, new_self_handle); |