[gnome-shell/gnome-3-14] Calendar: ignore timeouts starting the calendar-server

[Giovanni Campagna <gcampagna src gnome org>]

commit c568b44997e189c8d11ea129696a3d85162abae2
Author: Giovanni Campagna <scampa giovanni gmail com>
Date:   Wed Dec 10 16:41:48 2014 -0800

    Calendar: ignore timeouts starting the calendar-server
    
    In certain cases the timeout for starting the calendar helper can
    be reached but the calendar helper still loads fine. If so, just
    ignore the timeout and wait until we get a notification from
    dbus of the successful start.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735308

 js/ui/calendar.js |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index c97d380..9f8823e 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -252,11 +252,24 @@ const DBusEventSource = new Lang.Class({
         this._initialized = false;
         this._dbusProxy = new CalendarServer();
         this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
+            let loaded = false;
+
             try {
                 this._dbusProxy.init_finish(result);
+                loaded = true;
             } catch(e) {
-                log('Error loading calendars: ' + e.message);
-                return;
+                if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
+                    // Ignore timeouts and install signals as normal, because with high
+                    // probability the service will appear later on, and we will get a
+                    // NameOwnerChanged which will finish loading
+                    //
+                    // (But still _initialized to false, because the proxy does not know
+                    // about the HasCalendars property and would cause an exception trying
+                    // to read it)
+                } else {
+                    log('Error loading calendars: ' + e.message);
+                    return;
+                }
             }
 
             this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
@@ -272,9 +285,11 @@ const DBusEventSource = new Lang.Class({
                 this.emit('notify::has-calendars');
             }));
 
-            this._initialized = true;
-            this.emit('notify::has-calendars');
-            this._onNameAppeared();
+            this._initialized = loaded;
+            if (loaded) {
+                this.emit('notify::has-calendars');
+                this._onNameAppeared();
+            }
         }));
     },
 
@@ -296,6 +311,7 @@ const DBusEventSource = new Lang.Class({
     },
 
     _onNameAppeared: function(owner) {
+        this._initialized = true;
         this._resetCache();
         this._loadEvents(true);
     },