Merge lp:~gero-bare/maya/maya-exclude-nonwritable-calendars-in-enventdialog into lp:~elementary-apps/maya/trunk

[Gero.Bare]

Exclude read-only calendars from the eventdialog.

Introduced a new check. If the calendar is not writable is excluded from being added in the EventDialog.

This in the case of for example Birthday and Anniversaries calendar which is not writable thus doesn't make sense add to EventDialog.

see the comment bellow over this check if (src.writable == true && src.enabled == true && calmodel.calclient_is_readonly(src))

[Corentin Noël (tintou)]

Here are some comments and required fixes about this merge (see inline comments)

review: Needs Fixing (code)

[Corentin Noël (tintou)]

Working fine now.

review: Approve (code)

=== modified file 'core/Model/CalendarModel.vala'
--- core/Model/CalendarModel.vala	2014-11-04 22:32:52 +0000
+++ core/Model/CalendarModel.vala	2014-11-15 16:36:49 +0000
@@ -135,6 +135,20 @@
         add_event_async.begin (source, event);
     }
 
+    public bool calclient_is_readonly (E.Source source) {
+        E.CalClient client;
+        lock (source_client) {
+            client = source_client.get (source.dup_uid ());
+        }
+        if (client != null) {
+            return client.is_readonly ();
+        } else {
+                critical ("No calendar client was found");
+        }
+
+        return true;
+    }
+
     private async void add_event_async (E.Source source, E.CalComponent event) {
         SourceFunc callback = add_event_async.callback;
         Threads.add (() => {
@@ -451,4 +465,4 @@
 
         events_removed (source, removed_events.read_only_view);
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Widgets/CalendarButton.vala'
--- src/Widgets/CalendarButton.vala	2014-11-04 22:05:58 +0000
+++ src/Widgets/CalendarButton.vala	2014-11-15 16:36:49 +0000
@@ -40,9 +40,10 @@
     public CalendarButton () {
         set_alignment (0, 0.5f);
         sources = new GLib.List<E.Source> ();
-        var registry = Maya.Model.CalendarModel.get_default ().registry;
+        var calmodel = Model.CalendarModel.get_default ();
+        var registry = calmodel.registry;
         foreach (var src in registry.list_sources (E.SOURCE_EXTENSION_CALENDAR)) {
-            if (src.writable == true && src.enabled == true) {
+            if (src.writable == true && src.enabled == true && calmodel.calclient_is_readonly (src) == false) {
                 sources.append (src);
             }
         }
@@ -184,4 +185,4 @@
             calendar_color_label.override_background_color (Gtk.StateFlags.NORMAL, color);
         }
     }
-}
\ No newline at end of file
+}