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

[Ray Strode <halfline src gnome org>]

commit 67a590e6661b2ae3ad6621457f2ca7c2c9cf130b
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 6635c26..69393e6 100644
--- a/src/goaidentity/goakerberosidentity.c
+++ b/src/goaidentity/goakerberosidentity.c
@@ -105,9 +105,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);