Merge lp:~wingpanel-devs/wingpanel-indicator-datetime/speedup_loading into lp:~wingpanel-devs/wingpanel-indicator-datetime/trunk

[Djax]

load calendar model threaded

The connection and loading of EDS take some time and blocks the appearing of wingpanel. This branch is loading the data in a thread.

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-02-06 17:07:46 +0000
+++ src/Indicator.vala	2016-07-11 20:07:07 +0000
@@ -72,7 +72,9 @@
                 this.close ();
             });
             calendar.margin_bottom = 6;
-
+            calendar.selection_changed.connect ((date) => {
+                Idle.add (update_events);
+            });
             main_grid.attach (calendar, 0, position++, 1, 1);
 
             event_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
@@ -87,10 +89,6 @@
             main_grid.attach (new Wingpanel.Widgets.Separator (), 0, position++, 1, 1);
 
             main_grid.attach (settings_button, 0, position++, 1, 1);
-
-            calendar.selection_changed.connect ((date) => {
-                Idle.add (update_events);
-            });
         }
 
         this.visible = true;
 
=== modified file 'src/Widgets/calendar/CalendarModel.vala'
--- src/Widgets/calendar/CalendarModel.vala	2016-01-12 23:12:16 +0000
+++ src/Widgets/calendar/CalendarModel.vala	2016-07-11 20:07:07 +0000
@@ -116,7 +116,6 @@
         HashTable<E.Source, Gee.TreeMap<string, E.CalComponent> > source_events;
 
         private static CalendarModel? calendar_model = null;
-
         public enum Weekday {
             SUNDAY,
             MONDAY,
@@ -128,16 +127,27 @@
         }
 
         public static CalendarModel get_default () {
-            if (calendar_model == null) {
-                calendar_model = new CalendarModel ();
-                calendar_model.load_all_sources ();
+            lock (calendar_model) {
+                if (calendar_model == null) {
+                    calendar_model = new CalendarModel ();
+                    calendar_model.load_all_sources ();
+                }
             }
 
             return calendar_model;
         }
 
         private CalendarModel () {
-            /* It's dirty, but there is no other way to get it for the moment. */
+            // threaded initalization
+            try {
+                new Thread<bool> .try ("loader", threaded_init);
+            } catch (Error e) {
+                stderr.printf ("Error: %s\n", e.message);
+            }
+        }
+
+        private bool threaded_init () {
+             /* It's dirty, but there is no other way to get it for the moment. */
             string output;
             int week_start = 2;
             try {
@@ -200,6 +210,8 @@
             } catch (GLib.Error error) {
                 critical (error.message);
             }
+            parameters_changed ();
+            return true;
         }
 
         /* --- Public Methods ---// */
@@ -454,7 +466,7 @@
                 updated_events.add (event);
                 debug_event (source, event);
             }
-           
+
             events_updated (source, updated_events.read_only_view);
         }
 
 
=== modified file 'src/Widgets/calendar/CalendarView.vala'
--- src/Widgets/calendar/CalendarView.vala	2016-01-10 20:44:47 +0000
+++ src/Widgets/calendar/CalendarView.vala	2016-07-11 20:07:07 +0000
@@ -46,8 +46,6 @@
         stack.show_all ();
         stack.expand = true;
 
-        sync_with_model ();
-
         var model = CalendarModel.get_default ();
         model.parameters_changed.connect (on_model_parameters_changed);
 
 
=== modified file 'src/Widgets/calendar/ControlHeader.vala'
--- src/Widgets/calendar/ControlHeader.vala	2016-01-07 14:46:41 +0000
+++ src/Widgets/calendar/ControlHeader.vala	2016-07-11 20:07:07 +0000
@@ -27,7 +27,7 @@
             Object (orientation : Gtk.Orientation.HORIZONTAL);
             var left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic");
             var right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic");
-            var center_button = new Gtk.Button.with_label (CalendarModel.get_default ().month_start.format ("%B %Y"));
+            var center_button = new Gtk.Button.with_label (new GLib.DateTime.now_local ().format ("%B %Y"));
             CalendarModel.get_default ().parameters_changed.connect (() => {
                 var date = CalendarModel.get_default ().month_start;
                 center_button.set_label (date.format ("%B %Y"));