Set up glue for native Evolution Data Server event source

Right now it's just native code returning a fake event.

Signed-off-by: David Zeuthen <davidz@redhat.com>

js/ui/calendar.js

@@ -10,6 +10,7 @@ const Gettext_gtk30 = imports.gettext.domain('gtk30');
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
 
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
@@ -52,21 +53,21 @@ function _getEndOfDay(date) {
     return ret;
 }
 
-function _formatTaskTime(task, clockFormat) {
+function _formatEventTime(event, clockFormat) {
     let ret;
-    if (task.allDay) {
+    if (event.allDay) {
         /* Translators: Shown in calendar event list for all day events */
         ret = _("All Day");
     } else {
         switch (clockFormat) {
         case '24h':
-            ret = task.date.toLocaleFormat('%H:%M');
+            ret = event.date.toLocaleFormat('%H:%M');
             break;
 
         default:
             /* explicit fall-through */
         case '12h':
-            ret = task.date.toLocaleFormat('%l:%M %p');
+            ret = event.date.toLocaleFormat('%l:%M %p');
             break;
         }
     }
@@ -148,13 +149,13 @@ function _getEventDayAbbreviation(dayNumber) {
     return abbreviations[dayNumber];
 }
 
-// Abstraction for an appointment/task in a calendar
+// Abstraction for an appointment/event in a calendar
 
-function CalendarTask(date, summary, allDay) {
+function CalendarEvent(date, summary, allDay) {
     this._init(date, summary, allDay);
 }
 
-CalendarTask.prototype = {
+CalendarEvent.prototype = {
     _init: function(date, summary, allDay) {
         this.date = date;
         this.summary = summary;
@@ -162,9 +163,8 @@ CalendarTask.prototype = {
     }
 };
 
-// Interface for appointments/tasks - e.g. the contents of a calendar
+// Interface for appointments/events - e.g. the contents of a calendar
 //
-// TODO: write e.g. EvolutionEventSource
 
 // First, an implementation with no events
 function EmptyEventSource() {
@@ -175,18 +175,55 @@ EmptyEventSource.prototype = {
     _init: function() {
     },
 
-    getTasks: function(begin, end) {
+    getEvents: function(begin, end) {
         let result = [];
         return result;
     },
 
-    hasTasks: function(day) {
+    hasEvents: function(day) {
         return false;
     }
 };
 Signals.addSignalMethods(EmptyEventSource.prototype);
 
-// Second, an implementation with fake events
+// Second, wrap native Evolution event source
+function EvolutionEventSource() {
+    this._init();
+}
+
+EvolutionEventSource.prototype = {
+    _init: function() {
+        this._native = new Shell.EvolutionEventSource();
+        this._native.connect('changed', Lang.bind(this, function() {
+            this.emit('changed');
+        }));
+    },
+
+    getEvents: function(begin, end) {
+        let result = [];
+        let nativeEvents = this._native.get_events(begin.getTime(), end.getTime());
+        for (let n = 0; n < nativeEvents.length; n++) {
+            let nativeEvent = nativeEvents[n];
+            result.push(new CalendarEvent(new Date(nativeEvent.date), nativeEvent.summary, nativeEvent.all_day));
+        }
+        return result;
+    },
+
+    hasEvents: function(day) {
+        let dayBegin = _getBeginningOfDay(day);
+        let dayEnd = _getEndOfDay(day);
+
+        let events = this.getEvents(dayBegin, dayEnd);
+
+        if (events.length == 0)
+            return false;
+
+        return true;
+    }
+};
+Signals.addSignalMethods(EvolutionEventSource.prototype);
+
+// Finally, an implementation with fake events
 function FakeEventSource() {
     this._init();
 }
@@ -194,7 +231,7 @@ function FakeEventSource() {
 FakeEventSource.prototype = {
     _init: function() {
 
-        this._fakeTasks = [];
+        this._fakeEvents = [];
 
         // Generate fake events
         //
@@ -206,7 +243,7 @@ FakeEventSource.prototype = {
             let t = new Date(midnightToday.getTime() - n * 4 * 86400 * 1000);
             t.setHours(10);
             summary = '10-oclock pow-wow (n=' + n + ')';
-            this._fakeTasks.push(new CalendarTask(t, summary, false));
+            this._fakeEvents.push(new CalendarEvent(t, summary, false));
         }
 
         // '11-oclock thing' is an event occuring every three days at 11am
@@ -214,7 +251,7 @@ FakeEventSource.prototype = {
             let t = new Date(midnightToday.getTime() + n * 3 * 86400 * 1000);
             t.setHours(11);
             summary = '11-oclock thing (n=' + n + ')';
-            this._fakeTasks.push(new CalendarTask(t, summary, false));
+            this._fakeEvents.push(new CalendarEvent(t, summary, false));
         }
 
         // 'Weekly Meeting' is an event occuring every seven days at 1:45pm (two days displaced)
@@ -223,21 +260,21 @@ FakeEventSource.prototype = {
             t.setHours(13);
             t.setMinutes(45);
             summary = 'Weekly Meeting (n=' + n + ')';
-            this._fakeTasks.push(new CalendarTask(t, summary, false));
+            this._fakeEvents.push(new CalendarEvent(t, summary, false));
         }
 
         // 'Fun All Day' is an all-day event occuring every fortnight (three days displayed)
         for (let n = 0; n < 10; n++) {
             let t = new Date(midnightToday.getTime() + (n * 14 + 3) * 86400 * 1000);
             summary = 'Fun All Day (n=' + n + ')';
-            this._fakeTasks.push(new CalendarTask(t, summary, true));
+            this._fakeEvents.push(new CalendarEvent(t, summary, true));
         }
 
         // 'Get Married' is an event that actually reflects reality (Dec 4, 2010) :-)
-        this._fakeTasks.push(new CalendarTask(new Date(2010, 11, 4, 16, 0), 'Get Married', false));
+        this._fakeEvents.push(new CalendarEvent(new Date(2010, 11, 4, 16, 0), 'Get Married', false));
 
         // ditto for 'NE Patriots vs NY Jets'
-        this._fakeTasks.push(new CalendarTask(new Date(2010, 11, 6, 20, 30), 'NE Patriots vs NY Jets', false));
+        this._fakeEvents.push(new CalendarEvent(new Date(2010, 11, 6, 20, 30), 'NE Patriots vs NY Jets', false));
 
         // An event for tomorrow @6:30pm that is added/removed every five
         // seconds (to check that the ::changed signal works)
@@ -247,7 +284,7 @@ FakeEventSource.prototype = {
         transientEventDate.setSeconds(0);
         Mainloop.timeout_add(5000, Lang.bind(this, this._updateTransientEvent));
         this._includeTransientEvent = false;
-        this._transientEvent = new CalendarTask(transientEventDate, 'A Transient Event', false);
+        this._transientEvent = new CalendarEvent(transientEventDate, 'A Transient Event', false);
         this._transientEventCounter = 1;
     },
 
@@ -259,32 +296,32 @@ FakeEventSource.prototype = {
         Mainloop.timeout_add(5000, Lang.bind(this, this._updateTransientEvent));
     },
 
-    getTasks: function(begin, end) {
+    getEvents: function(begin, end) {
         let result = [];
         //log('begin:' + begin);
         //log('end:  ' + end);
-        for(let n = 0; n < this._fakeTasks.length; n++) {
+        for(let n = 0; n < this._fakeEvents.length; n++) {
-            let task = this._fakeTasks[n];
+            let event = this._fakeEvents[n];
-            if (task.date >= begin && task.date <= end) {
+            if (event.date >= begin && event.date <= end) {
-                result.push(task);
+                result.push(event);
             }
-            //log('when:' + task.date + ' summary:' + task.summary);
+            //log('when:' + event.date + ' summary:' + event.summary);
         }
         if (this._includeTransientEvent && this._transientEvent.date >= begin && this._transientEvent.date <= end)
             result.push(this._transientEvent);
-        result.sort(function(task1, task2) {
+        result.sort(function(event1, event2) {
-            return task1.date.getTime() - task2.date.getTime();
+            return event1.date.getTime() - event2.date.getTime();
         });
         return result;
     },
 
-    hasTasks: function(day) {
+    hasEvents: function(day) {
         let dayBegin = _getBeginningOfDay(day);
         let dayEnd = _getEndOfDay(day);
 
-        let tasks = this.getTasks(dayBegin, dayEnd);
+        let events = this.getEvents(dayBegin, dayEnd);
 
-        if (tasks.length == 0)
+        if (events.length == 0)
             return false;
 
         return true;
@@ -295,7 +332,7 @@ Signals.addSignalMethods(FakeEventSource.prototype);
 
 // Calendar:
 // @eventSource: is an object implementing the EventSource API, e.g. the
-// getTasks(), hasTasks() methods and the ::changed signal.
+// getEvents(), hasEvents() methods and the ::changed signal.
 function Calendar(eventSource) {
     this._init(eventSource);
 }
@@ -497,8 +534,8 @@ Calendar.prototype = {
             }));
 
             let styleClass;
-            let hasTasks;
+            let hasEvents;
-            hasTasks = this._eventSource.hasTasks(iter);
+            hasEvents = this._eventSource.hasEvents(iter);
             styleClass = 'calendar-day-base calendar-day';
             if (_isWorkDay(iter))
                 styleClass += ' calendar-work-day'
@@ -513,7 +550,7 @@ Calendar.prototype = {
             if (_sameDay(this.selectedDate, iter))
                 button.add_style_pseudo_class('active');
 
-            if (hasTasks)
+            if (hasEvents)
                 styleClass += ' calendar-day-with-events'
 
             button.style_class = styleClass;
@@ -571,11 +608,11 @@ EventsList.prototype = {
     },
 
     _addPeriod: function(header, begin, end, includeDayName, showNothingScheduled) {
-        let tasks = this._eventSource.getTasks(begin, end);
+        let events = this._eventSource.getEvents(begin, end);
 
         let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);;
 
-        if (tasks.length == 0 && !showNothingScheduled)
+        if (events.length == 0 && !showNothingScheduled)
             return;
 
         let vbox = new St.BoxLayout( {vertical: true} );
@@ -591,20 +628,20 @@ EventsList.prototype = {
         box.add(eventTitleBox, {expand: true});
         vbox.add(box);
 
-        for (let n = 0; n < tasks.length; n++) {
+        for (let n = 0; n < events.length; n++) {
-            let task = tasks[n];
+            let event = events[n];
-            let dayString = _getEventDayAbbreviation(task.date.getDay());
+            let dayString = _getEventDayAbbreviation(event.date.getDay());
-            let timeString = _formatTaskTime(task, clockFormat);
+            let timeString = _formatEventTime(event, clockFormat);
-            let summaryString = task.summary;
+            let summaryString = event.summary;
             this._addEvent(dayNameBox, timeBox, eventTitleBox, includeDayName, dayString, timeString, summaryString);
         }
 
-        if (tasks.length == 0 && showNothingScheduled) {
+        if (events.length == 0 && showNothingScheduled) {
             let now = new Date();
             /* Translators: Text to show if there are no events */
-            let nothingTask = new CalendarTask(now, _("Nothing Scheduled"), true);
+            let nothingEvent = new CalendarEvent(now, _("Nothing Scheduled"), true);
-            let timeString = _formatTaskTime(nothingTask, clockFormat);
+            let timeString = _formatEventTime(nothingEvent, clockFormat);
-            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingTask.summary);
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingEvent.summary);
         }
     },
 

js/ui/dateMenu.js

@@ -56,7 +56,8 @@ DateMenuButton.prototype = {
         let vbox;
 
         //this._eventSource = new Calendar.EmptyEventSource();
-        this._eventSource = new Calendar.FakeEventSource();
+        //this._eventSource = new Calendar.FakeEventSource();
+        this._eventSource = new Calendar.EvolutionEventSource();
         // TODO: write e.g. EvolutionEventSource
 
         PanelMenu.Button.prototype._init.call(this, St.Align.START);

src/Makefile.am

@@ -89,6 +89,8 @@ libgnome_shell_la_SOURCES =		\
 	shell-doc-system.c		\
 	shell-drawing.c			\
 	shell-embedded-window.c		\
+	shell-evolution-event-source.h	\
+	shell-evolution-event-source.c	\
 	shell-generic-container.c	\
 	shell-gtk-embed.c		\
 	shell-global.c			\

src/shell-evolution-event-source.c

@@ -0,0 +1,120 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include "config.h"
+
+#include "shell-evolution-event-source.h"
+
+
+struct _ShellEvolutionEventSourceClass
+{
+  GObjectClass parent_class;
+};
+
+struct _ShellEvolutionEventSource {
+  GObject parent;
+
+};
+
+/* Signals */
+enum
+{
+  CHANGED_SIGNAL,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+G_DEFINE_TYPE (ShellEvolutionEventSource, shell_evolution_event_source, G_TYPE_OBJECT);
+
+static void
+shell_evolution_event_source_init (ShellEvolutionEventSource *source)
+{
+}
+
+static void
+shell_evolution_event_source_class_init (ShellEvolutionEventSourceClass *klass)
+{
+  signals[CHANGED_SIGNAL] =
+    g_signal_new ("changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+}
+
+ShellEvolutionEventSource *
+shell_evolution_event_source_new (void)
+{
+  return SHELL_EVOLUTION_EVENT_SOURCE (g_object_new (SHELL_TYPE_EVOLUTION_EVENT_SOURCE, NULL));
+}
+
+/**
+ * shell_evolution_event_source_get_events:
+ * @source: A #ShellEvolutionEventSource.
+ * @date_begin: Start date (milli-seconds since Epoch).
+ * @date_end: End date (milli-seconds since Epoch).
+ *
+ * Gets all events that occur between @date_begin and @date_end.
+ *
+ * Returns: (element-type ShellEvolutionEvent) (transfer full): List of events.
+ */
+GList *
+shell_evolution_event_source_get_events  (ShellEvolutionEventSource *source,
+                                          gint64                     date_begin,
+                                          gint64                     date_end)
+{
+  GList *result;
+
+  g_print ("get_events\n");
+  g_print (" date_begin = %" G_GINT64_FORMAT "\n", date_begin);
+  g_print (" date_end = %" G_GINT64_FORMAT "\n", date_end);
+
+  result = NULL;
+
+  gint64 event_time = 1295931631000 + 32 * 3600 * 1000;
+  if (event_time >= date_begin && event_time <= date_end)
+    {
+      ShellEvolutionEvent *event;
+      event = shell_evolution_event_new ("Stuff", FALSE, event_time);
+      result = g_list_prepend (result, event);
+    }
+
+  return result;
+}
+
+G_DEFINE_BOXED_TYPE (ShellEvolutionEvent,
+                     shell_evolution_event,
+                     shell_evolution_event_copy,
+                     shell_evolution_event_free);
+
+void
+shell_evolution_event_free (ShellEvolutionEvent *event)
+{
+  g_free (event->summary);
+  g_free (event);
+}
+
+ShellEvolutionEvent *
+shell_evolution_event_copy (ShellEvolutionEvent *event)
+{
+  ShellEvolutionEvent *copy;
+  copy = g_memdup (event, sizeof (ShellEvolutionEvent));
+  copy->summary = g_strdup (event->summary);
+  return copy;
+}
+
+ShellEvolutionEvent *
+shell_evolution_event_new (const gchar *summary,
+                           gboolean     all_day,
+                           gint64       date)
+{
+  ShellEvolutionEvent *event;
+  event = g_new0 (ShellEvolutionEvent, 1);
+  event->summary = g_strdup (summary);
+  event->all_day = all_day;
+  event->date = date;
+  return event;
+}

src/shell-evolution-event-source.h

@@ -0,0 +1,42 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+#ifndef __SHELL_EVOLUTION_EVENT_SOURCE_H__
+#define __SHELL_EVOLUTION_EVENT_SOURCE_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct _ShellEvolutionEvent            ShellEvolutionEvent;
+
+struct _ShellEvolutionEvent
+{
+  gchar    *summary;
+  gboolean  all_day;
+  gint64    date;
+};
+
+GType                shell_evolution_event_get_type (void) G_GNUC_CONST;
+ShellEvolutionEvent *shell_evolution_event_new      (const gchar *summary,
+                                                     gboolean     all_day,
+                                                     gint64       date);
+ShellEvolutionEvent *shell_evolution_event_copy     (ShellEvolutionEvent *event);
+void                 shell_evolution_event_free     (ShellEvolutionEvent *event);
+
+typedef struct _ShellEvolutionEventSource      ShellEvolutionEventSource;
+typedef struct _ShellEvolutionEventSourceClass ShellEvolutionEventSourceClass;
+
+#define SHELL_TYPE_EVOLUTION_EVENT_SOURCE              (shell_evolution_event_source_get_type ())
+#define SHELL_EVOLUTION_EVENT_SOURCE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), SHELL_TYPE_EVOLUTION_EVENT_SOURCE, ShellEvolutionEventSource))
+#define SHELL_EVOLUTION_EVENT_SOURCE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), SHELL_TYPE_EVOLUTION_EVENT_SOURCE, ShellEvolutionEventSourceClass))
+#define SHELL_IS_EVOLUTION_EVENT_SOURCE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), SHELL_TYPE_EVOLUTION_EVENT_SOURCE))
+#define SHELL_IS_EVOLUTION_EVENT_SOURCE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), SHELL_TYPE_EVOLUTION_EVENT_SOURCE))
+#define SHELL_EVOLUTION_EVENT_SOURCE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), SHELL_TYPE_EVOLUTION_EVENT_SOURCE, ShellEvolutionEventSourceClass))
+
+GType                      shell_evolution_event_source_get_type    (void) G_GNUC_CONST;
+ShellEvolutionEventSource *shell_evolution_event_source_new         (void);
+GList                     *shell_evolution_event_source_get_events  (ShellEvolutionEventSource *source,
+                                                                     gint64                     date_begin,
+                                                                     gint64                     date_end);
+G_END_DECLS
+
+#endif /* __SHELL_EVOLUTION_EVENT_SOURCE_H__ */