From 23d233857ebe42fd0af99c37850b87933e66cf26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 12 Feb 2019 19:40:13 +0100
Subject: [PATCH] calendar: Load interface description from resource

Here's a template string with '/' that escaped commit 94423151b2,
resulting in an xgettext warning when generating the .pot file.

Simply move it into the resource like the other interface descriptions
to make xgettext happy again.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/407
---
 .../org.gnome.Shell.CalendarServer.xml           | 12 ++++++++++++
 data/gnome-shell-dbus-interfaces.gresource.xml   |  1 +
 js/ui/calendar.js                                | 16 +++-------------
 3 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 data/dbus-interfaces/org.gnome.Shell.CalendarServer.xml

diff --git a/data/dbus-interfaces/org.gnome.Shell.CalendarServer.xml b/data/dbus-interfaces/org.gnome.Shell.CalendarServer.xml
new file mode 100644
index 000000000..c19883095
--- /dev/null
+++ b/data/dbus-interfaces/org.gnome.Shell.CalendarServer.xml
@@ -0,0 +1,12 @@
+<node>
+  <interface name="org.gnome.Shell.CalendarServer">
+    <method name="GetEvents">
+      <arg type="x" direction="in" />
+      <arg type="x" direction="in" />
+      <arg type="b" direction="in" />
+      <arg type="a(sssbxxa{sv})" direction="out" />
+    </method>
+    <property name="HasCalendars" type="b" access="read" />
+    <signal name="Changed" />
+  </interface>
+</node>
diff --git a/data/gnome-shell-dbus-interfaces.gresource.xml b/data/gnome-shell-dbus-interfaces.gresource.xml
index ba148ca1f..3352e0dcd 100644
--- a/data/gnome-shell-dbus-interfaces.gresource.xml
+++ b/data/gnome-shell-dbus-interfaces.gresource.xml
@@ -39,6 +39,7 @@
     <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Rfkill.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Wacom.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.AudioDeviceSelection.xml</file>
+    <file preprocess="xml-stripblanks">org.gnome.Shell.CalendarServer.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.Extensions.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.Introspect.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.HotplugSniffer.xml</file>
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 28e0d86d2..cd3e879c4 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -9,6 +9,8 @@ const MessageTray = imports.ui.messageTray;
 const Mpris = imports.ui.mpris;
 const Util = imports.misc.util;
 
+const { loadInterfaceXML } = imports.misc.fileUtils;
+
 var MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 var SHOW_WEEKDATE_KEY = 'show-weekdate';
 var ELLIPSIS_CHAR = '\u2026';
@@ -121,19 +123,7 @@ var EmptyEventSource = class EmptyEventSource {
 };
 Signals.addSignalMethods(EmptyEventSource.prototype);
 
-const CalendarServerIface = `
-<node>
-<interface name="org.gnome.Shell.CalendarServer">
-<method name="GetEvents">
-    <arg type="x" direction="in" />
-    <arg type="x" direction="in" />
-    <arg type="b" direction="in" />
-    <arg type="a(sssbxxa{sv})" direction="out" />
-</method>
-<property name="HasCalendars" type="b" access="read" />
-<signal name="Changed" />
-</interface>
-</node>`;
+const CalendarServerIface = loadInterfaceXML('org.gnome.Shell.CalendarServer');
 
 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);