summaryrefslogtreecommitdiff
path: root/libpurple/purpleconversationmember.c
diff options
context:
space:
mode:
Diffstat (limited to 'libpurple/purpleconversationmember.c')
-rw-r--r--libpurple/purpleconversationmember.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libpurple/purpleconversationmember.c b/libpurple/purpleconversationmember.c
index aad18474ff..771e13c647 100644
--- a/libpurple/purpleconversationmember.c
+++ b/libpurple/purpleconversationmember.c
@@ -128,10 +128,7 @@ purple_conversation_member_dispose(GObject *obj) {
g_clear_object(&member->contact_info);
- if(member->typing_timeout != 0) {
- g_source_remove(member->typing_timeout);
- member->typing_timeout = 0;
- }
+ g_clear_handle_id(&member->typing_timeout, g_source_remove);
G_OBJECT_CLASS(purple_conversation_member_parent_class)->dispose(obj);
}
@@ -246,10 +243,7 @@ purple_conversation_member_set_typing_state(PurpleConversationMember *member,
g_return_if_fail(PURPLE_IS_CONVERSATION_MEMBER(member));
/* Remove an existing timeout if necessary. */
- if(member->typing_timeout != 0) {
- g_source_remove(member->typing_timeout);
- member->typing_timeout = 0;
- }
+ g_clear_handle_id(&member->typing_timeout, g_source_remove);
/* If the state has changed, notify. */
if(state != member->typing_state) {