[gnome-online-accounts/gnome-3-12] identity: Destroy alarms from main thread, even on dispose

[Debarshi Ray <debarshir src gnome org>]

commit 77f92cae319ded15a67a4bbe07c5edf5a56b1a17
Author: Ray Strode <rstrode redhat com>
Date:   Thu Oct 30 14:12:08 2014 -0400

    identity: Destroy alarms from main thread, even on dispose
    
    These days we defer destroying alarms to the main thread when
    alarms are reset.  We still dispose of alarms in the current
    thread when disposing their identity object, however.
    
    This commit changes the code to always dispose of alarms from
    the main thread.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=739593

 src/goaidentity/goakerberosidentity.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/src/goaidentity/goakerberosidentity.c b/src/goaidentity/goakerberosidentity.c
index 2352e6c..2bdf59f 100644
--- a/src/goaidentity/goakerberosidentity.c
+++ b/src/goaidentity/goakerberosidentity.c
@@ -107,9 +107,7 @@ goa_kerberos_identity_dispose (GObject *object)
   GoaKerberosIdentity *self = GOA_KERBEROS_IDENTITY (object);
 
   G_LOCK (identity_lock);
-  g_clear_object (&self->priv->renewal_alarm);
-  g_clear_object (&self->priv->expiring_alarm);
-  g_clear_object (&self->priv->expiration_alarm);
+  clear_alarms (self);
   G_UNLOCK (identity_lock);
 
   G_OBJECT_CLASS (goa_kerberos_identity_parent_class)->dispose (object);