From 7b466aed56ea6264293d6fe7c35eb1e6caca9e47 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 23 Feb 2021 11:44:38 -0700
Subject: [PATCH] Calendar: Prefer icon from link registry, fall back to app
 icon if it's not set

---
 calendar/js/et2_widget_event.js | 3 ++-
 calendar/js/et2_widget_event.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index 54d82c5f8f..7d91663211 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -498,7 +498,8 @@ var et2_calendar_event = /** @class */ (function (_super) {
         }
         else {
             if (this.options.value.app !== 'calendar') {
-                icons.push('<img src="' + this.egw().image('navbar', this.options.value.app) + '" title="' + this.egw().lang(this.options.value.app) + '"/>');
+                var app_icon = "" + (egw.link_get_registry(this.options.value.app, 'icon') || (this.options.value.app + '/navbar'));
+                icons.push('<img src="' + this.egw().image(app_icon) + '" title="' + this.egw().lang(this.options.value.app) + '"/>');
             }
             if (this.options.value.priority == 3) {
                 icons.push('<img src="' + this.egw().image('high', 'calendar') + '" title="' + this.egw().lang('high priority') + '"/>');
diff --git a/calendar/js/et2_widget_event.ts b/calendar/js/et2_widget_event.ts
index efaf762374..1508134e56 100644
--- a/calendar/js/et2_widget_event.ts
+++ b/calendar/js/et2_widget_event.ts
@@ -633,7 +633,8 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
 		{
 			if(this.options.value.app !== 'calendar')
 			{
-				icons.push('<img src="'+this.egw().image('navbar',this.options.value.app)+'" title="'+this.egw().lang(this.options.value.app)+'"/>');
+				let app_icon = ""+(egw.link_get_registry(this.options.value.app,'icon') || (this.options.value.app + '/navbar'));
+				icons.push('<img src="'+this.egw().image(app_icon)+'" title="'+this.egw().lang(this.options.value.app)+'"/>');
 			}
 			if(this.options.value.priority == 3)
 			{