[gnome-online-accounts/f19] Fix busy loop on kinit

[Ray Strode]

commit b0631296c81cad78cf4ac3cbe9b8c90662d2bdee
Author: Ray Strode <rstrode at redhat.com>
Date:   Fri Sep 27 14:31:19 2013 -0400

    Fix busy loop on kinit
    
    Resolves: #1005619

 fix-kinit-cpu-loop.patch   |   95 ++++++++++++++++++++++++++++++++++++++++++++
 gnome-online-accounts.spec |    9 ++++-
 2 files changed, 103 insertions(+), 1 deletions(-)
---
diff --git a/fix-kinit-cpu-loop.patch b/fix-kinit-cpu-loop.patch
new file mode 100644
index 0000000..8cb722b
--- /dev/null
+++ b/fix-kinit-cpu-loop.patch
@@ -0,0 +1,95 @@
+From 300a9ed2392c34c349cb6fa71370fb305625aa07 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 20 Sep 2013 13:45:02 -0400
+Subject: [PATCH] goaidentity: use proper main context
+
+The previous commit uses the wrong main context, which ultimately
+leads symptoms including crashes and 100% cpu usage.
+
+This commit just tweaks the previous commit a little bit, to use
+the proper context.
+---
+ src/goaidentity/goaalarm.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/goaidentity/goaalarm.c b/src/goaidentity/goaalarm.c
+index ae749f7..e9b904b 100644
+--- a/src/goaidentity/goaalarm.c
++++ b/src/goaidentity/goaalarm.c
+@@ -242,72 +242,68 @@ goa_alarm_class_init (GoaAlarmClass *klass)
+   g_object_class_install_property (object_class,
+                                    PROP_TIME,
+                                    g_param_spec_boxed ("time",
+                                                        _("Time"),
+                                                        _("Time to fire"),
+                                                        G_TYPE_DATE_TIME,
+                                                        G_PARAM_READWRITE));
+ }
+ 
+ static void
+ goa_alarm_init (GoaAlarm *self)
+ {
+   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOA_TYPE_ALARM, GoaAlarmPrivate);
+   self->priv->type = GOA_ALARM_TYPE_UNSCHEDULED;
+   g_rec_mutex_init (&self->priv->lock);
+ }
+ 
+ static gboolean
+ async_alarm_cancel_idle_cb (gpointer user_data)
+ {
+   GoaAlarm *self = user_data;
+ 
+   clear_scheduled_wakeups (self);
+   return G_SOURCE_REMOVE;
+ }
+ 
+ static void
+ on_cancelled (GCancellable *cancellable, gpointer user_data)
+ {
+   GoaAlarm *self = GOA_ALARM (user_data);
+-  GMainContext *main_context;
+   GSource *idle_source;
+ 
+-  main_context = g_main_context_ref_thread_default ();
+ 
+   idle_source = g_idle_source_new ();
+   g_source_set_priority (idle_source, G_PRIORITY_HIGH_IDLE);
+   g_source_set_callback (idle_source, async_alarm_cancel_idle_cb, g_object_ref (self), g_object_unref);
+-  g_source_attach (idle_source, main_context);
++  g_source_attach (idle_source, self->priv->context);
+   g_source_unref (idle_source);
+-
+-  g_main_context_unref (main_context);
+ }
+ 
+ static void
+ fire_alarm (GoaAlarm *self)
+ {
+   g_signal_emit (G_OBJECT (self), signals[FIRED], 0);
+ }
+ 
+ static void
+ rearm_alarm (GoaAlarm *self)
+ {
+   g_signal_emit (G_OBJECT (self), signals[REARMED], 0);
+ }
+ 
+ static void
+ fire_or_rearm_alarm (GoaAlarm *self)
+ {
+   GTimeSpan time_until_fire;
+   GTimeSpan previous_time_until_fire;
+   GDateTime *now;
+ 
+   now = g_date_time_new_now_local ();
+   time_until_fire = g_date_time_difference (self->priv->time, now);
+ 
+   if (self->priv->previous_wakeup_time == NULL)
+     {
+       self->priv->previous_wakeup_time = now;
+ 
+       /* If, according to the time, we're past when we should have fired,
+        * then fire the alarm.
+-- 
+1.8.3.1
+
diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec
index 6c25edb..29b75f0 100644
--- a/gnome-online-accounts.spec
+++ b/gnome-online-accounts.spec
@@ -1,6 +1,6 @@
 Name:		gnome-online-accounts
 Version:	3.8.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Provide online accounts information
 
 Group:		System Environment/Libraries
@@ -22,6 +22,8 @@ BuildRequires:	libsoup-devel >= 2.41
 BuildRequires:	rest-devel
 BuildRequires:	libxml2-devel
 
+Patch0: fix-kinit-cpu-loop.patch
+
 %description
 gnome-online-accounts provides interfaces so applications and
 libraries in GNOME can access the user's online accounts.
@@ -39,6 +41,7 @@ files for developing applications that use gnome-online-accounts.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-kinit-cpu-loop
 
 %build
 %configure \
@@ -99,6 +102,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/goa-1.0/include
 
 %changelog
+* Fri Sep 27 2013 Ray Strode <rstrode at redhat.com> 3.8.3-2
+- Fix busy loop on kinit
+  Resolves: #1005619
+
 * Fri Aug 30 2013 Debarshi Ray <rishi at fedoraproject.org> - 3.8.3-1
 - Update to 3.8.3