[nemo-qml-plugin-calendar] Remove deprecated exclude setting and upda…

…te notebook visibility. Fixes JB#50237
sailfishos · Jun 16, 2020 · 2ef9f53 · 2ef9f53
1 parent 4a039cc
commit 2ef9f53
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/calendarworker.cpp b/src/calendarworker.cpp
@@ -907,9 +907,15 @@ void CalendarWorker::loadNotebooks()
                 && !mkNotebook->isShared()
                 && mkNotebook->pluginName().isEmpty();
 
-        notebook.excluded = !mkNotebook->isVisible()
-            // To keep backward compatibility:
-            || settings.value("exclude/" + notebook.uid, false).toBool();
+        notebook.excluded = !mkNotebook->isVisible();
+        // To keep backward compatibility:
+        if (settings.value("exclude/" + notebook.uid, false).toBool()) {
+            mkNotebook->setIsVisible(false);
+            if (notebook.excluded || mStorage->updateNotebook(mkNotebook)) {
+                settings.remove("exclude/" + notebook.uid);
+            }
+            notebook.excluded = true;
+        }
 
         notebook.color = settings.value("colors/" + notebook.uid, QString()).toString();
         if (notebook.color.isEmpty())