Bug#925988: unblock: sogo-connector/60.0.2-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package sogo-connector
sogo-connector is a extension for Thunderbird which has no reverse
dependencies.
I'd like to see the sogo-connector package gets updated in
testing/buster. Upstream has fixed some minor issues regarding the
invitations dialog which could be always empty. The packaging itself got
no changes.
I've attached the debdiff output from the version currently in testing
against the version in unstable. Thanks for considering.
unblock sogo-connector/60.0.2-1
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.19.0-4-amd64 (SMP w/6 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru sogo-connector-60.0.1/chrome/content/sogo-connector/calendar/calendar-invitations-list.xml sogo-connector-60.0.2/chrome/content/sogo-connector/calendar/calendar-invitations-list.xml
--- sogo-connector-60.0.1/chrome/content/sogo-connector/calendar/calendar-invitations-list.xml 2019-02-20 14:31:59.000000000 +0100
+++ sogo-connector-60.0.2/chrome/content/sogo-connector/calendar/calendar-invitations-list.xml 2019-02-26 17:17:20.000000000 +0100
@@ -1,42 +1,7 @@
<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
- - Version: MPL 1.1/GPL 2.0/LGPL 2.1
- -
- - The contents of this file are subject to the Mozilla Public License Version
- - 1.1 (the "License"); you may not use this file except in compliance with
- - the License. You may obtain a copy of the License at
- - http://www.mozilla.org/MPL/
- -
- - Software distributed under the License is distributed on an "AS IS" basis,
- - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- - for the specific language governing rights and limitations under the
- - License.
- -
- - The Original Code is Sun Microsystems code.
- -
- - The Initial Developer of the Original Code is Sun Microsystems.
- - Portions created by the Initial Developer are Copyright (C) 2006
- - the Initial Developer. All Rights Reserved.
- -
- - Contributor(s):
- - Thomas Benisch <thomas.benisch@sun.com>
- - Philipp Kewisch <mozilla@kewis.ch>
- - Martin Schroeder <mschroeder@mozilla.x-home.org>
- - Simon Vaillancourt <simon.at.orcl@gmail.com>
- -
- - Alternatively, the contents of this file may be used under the terms of
- - either the GNU General Public License Version 2 or later (the "GPL"), or
- - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- - in which case the provisions of the GPL or the LGPL are applicable instead
- - of those above. If you wish to allow use of your version of this file only
- - under the terms of either the GPL or the LGPL, and not to allow others to
- - use your version of this file under the terms of the MPL, indicate your
- - decision by deleting the provisions above and replace them with the notice
- - and other provisions required by the LGPL or the GPL. If you do not delete
- - the provisions above, a recipient may use your version of this file under
- - the terms of any one of the MPL, the GPL or the LGPL.
- -
- - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE dialog [
<!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar-invitations-dialog.dtd" > %dtd1;
@@ -54,10 +19,10 @@
<method name="addCalendarItem">
<parameter name="aItem"/>
<body><![CDATA[
- var newNode = createXULElement("calendar-invitations-richlistitem");
- this.appendChild(newNode);
- newNode.setAttribute("anonid", "invitations-listitem");
- newNode.calendarItem = aItem;
+ let newNode = createXULElement("calendar-invitations-richlistitem");
+ this.appendChild(newNode);
+ newNode.setAttribute("anonid", "invitations-listitem");
+ newNode.calendarItem = aItem;
]]></body>
</method>
</implementation>
@@ -80,11 +45,15 @@
</xul:vbox>
<xul:vbox>
<xul:button anonid="accept"
+ xbl:inherits="group=itemId"
+ type="radio"
class="calendar-invitations-richlistitem-accept-button
calendar-invitations-richlistitem-button"
label="&calendar.invitations.list.accept.button.label;"
oncommand="accept();"/>
<xul:button anonid="decline"
+ xbl:inherits="group=itemId"
+ type="radio"
class="calendar-invitations-richlistitem-decline-button
calendar-invitations-richlistitem-button"
label="&calendar.invitations.list.decline.button.label;"
@@ -100,100 +69,107 @@
<field name="mInitialParticipationStatus">null</field>
<field name="mParticipationStatus">null</field>
+ <property name="mStrings">
+ <getter>
+ return {
+ alldayEvent: "&calendar.invitations.list.alldayevent.text;",
+ recurrentEvent: "&calendar.invitations.list.recurrentevent.text;",
+ location: "&calendar.invitations.list.location.text;",
+ organizer: "&calendar.invitations.list.organizer.text;",
+ attendee: "&calendar.invitations.list.attendee.text;",
+ none: "&calendar.invitations.list.none.text;"
+ };
+ </getter>
+ </property>
+
<!-- properties -->
<property name="calendarItem">
<getter><![CDATA[
- return this.mCalendarItem;
+ return this.mCalendarItem;
]]></getter>
<setter><![CDATA[
- this.setCalendarItem(val);
- return val;
+ this.setCalendarItem(val);
+ return val;
]]></setter>
</property>
<property name="initialParticipationStatus">
<getter><![CDATA[
- return this.mInitialParticipationStatus;
+ return this.mInitialParticipationStatus;
]]></getter>
<setter><![CDATA[
- this.mInitialParticipationStatus = val;
- return val;
+ this.mInitialParticipationStatus = val;
+ return val;
]]></setter>
</property>
<property name="participationStatus">
<getter><![CDATA[
- return this.mParticipationStatus;
+ return this.mParticipationStatus;
]]></getter>
<setter><![CDATA[
- this.mParticipationStatus = val;
- var icon = document.getAnonymousElementByAttribute(
- this, "anonid", "icon");
- icon.setAttribute("status", val);
- return val;
+ this.mParticipationStatus = val;
+ let icon = document.getAnonymousElementByAttribute(
+ this, "anonid", "icon");
+ icon.setAttribute("status", val);
+ return val;
]]></setter>
</property>
<!-- constructor -->
<constructor><![CDATA[
- this.mDateFormatter = getDateFormatter();
+ ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
+ this.mDateFormatter = cal.getDateFormatter();
]]></constructor>
<!-- methods -->
<method name="setCalendarItem">
<parameter name="aItem"/>
- <body>
- var alldayEventText = "&calendar.invitations.list.alldayevent.text;";
- var recurrentEventText = "&calendar.invitations.list.recurrentevent.text;";
- var locationText = "&calendar.invitations.list.location.text;";
- var organizerText = "&calendar.invitations.list.organizer.text;";
- var attendeeText = "&calendar.invitations.list.attendee.text;";
- var noneText = "&calendar.invitations.list.none.text;";
- <![CDATA[
+ <body><![CDATA[
this.mCalendarItem = aItem;
this.mInitialParticipationStatus =
this.getCalendarItemParticipationStatus(aItem);
this.participationStatus = this.mInitialParticipationStatus;
- var titleLabel = document.getAnonymousElementByAttribute(
+ let titleLabel = document.getAnonymousElementByAttribute(
this, "anonid", "title");
var titleValue = aItem.title + " (" + aItem.calendar.name + ")";
titleLabel.setAttribute("value", titleValue);
-
- var dateLabel = document.getAnonymousElementByAttribute(
+
+ let dateLabel = document.getAnonymousElementByAttribute(
this, "anonid", "date");
- var dateString = this.mDateFormatter.formatItemInterval(aItem);
+ let dateString = this.mDateFormatter.formatItemInterval(aItem);
if (aItem.startDate.isDate) {
- dateString += ", " + alldayEventText;
+ dateString += ", " + this.mStrings.alldayEvent;
}
dateLabel.setAttribute("value", dateString);
- var recurrenceLabel = document.getAnonymousElementByAttribute(
+ let recurrenceLabel = document.getAnonymousElementByAttribute(
this, "anonid", "recurrence");
if (aItem.recurrenceInfo) {
- recurrenceLabel.setAttribute("value", recurrentEventText);
+ recurrenceLabel.setAttribute("value", this.mStrings.recurrentEvent);
} else {
recurrenceLabel.setAttribute("hidden", "true");
- var spacer = document.getAnonymousElementByAttribute(
+ let spacer = document.getAnonymousElementByAttribute(
this, "anonid", "spacer");
spacer.removeAttribute("hidden");
}
- var locationLabel = document.getAnonymousElementByAttribute(
+ let locationLabel = document.getAnonymousElementByAttribute(
this, "anonid", "location");
- var locationString = locationText;
- var locationProperty = aItem.getProperty("LOCATION");
+ let locationString = this.mStrings.location;
+ let locationProperty = aItem.getProperty("LOCATION");
if (locationProperty && locationProperty.length > 0) {
locationString += locationProperty;
} else {
- locationString += noneText;
+ locationString += this.mStrings.none;
}
locationLabel.setAttribute("value", locationString);
- var organizerLabel = document.getAnonymousElementByAttribute(
+ let organizerLabel = document.getAnonymousElementByAttribute(
this, "anonid", "organizer");
- var organizerString = organizerText;
- var org = aItem.organizer;
+ let organizerString = this.mStrings.organizer;
+ let org = aItem.organizer;
if (org) {
if (org.commonName && org.commonName.length > 0) {
organizerString += org.commonName;
@@ -205,8 +181,8 @@
let attendeeLabel = document.getAnonymousElementByAttribute(
this, "anonid", "attendee");
- let attendeeString = attendeeText;
- let att = aItem.calendar.getInvitedAttendee(aItem);;
+ let attendeeString = this.mStrings.attendee;
+ let att = cal.itip.getInvitedAttendee(aItem);
if (att) {
if (att.commonName && att.commonName.length > 0) {
attendeeString += att.commonName;
@@ -215,18 +191,15 @@
}
}
attendeeLabel.setAttribute("value", attendeeString);
- ]]>
- </body>
+ this.setAttribute("itemId", aItem.hashId);
+ ]]></body>
</method>
<method name="getCalendarItemParticipationStatus">
<parameter name="aItem"/>
<body><![CDATA[
- var att;
- if (calInstanceOf(aItem.calendar, Components.interfaces.calISchedulingSupport)) {
- att = aItem.calendar.getInvitedAttendee(aItem);
- }
- return (att ? att.participationStatus : null);
+ let att = cal.itip.getInvitedAttendee(aItem);
+ return (att ? att.participationStatus : null);
]]></body>
</method>
@@ -234,31 +207,32 @@
<parameter name="aItem"/>
<parameter name="aStatus"/>
<body><![CDATA[
- if (calInstanceOf(aItem.calendar, Components.interfaces.calISchedulingSupport)) {
- var att = aItem.calendar.getInvitedAttendee(aItem);
- if (att) {
- var att_ = att.clone();
- att_.participationStatus = aStatus;
-
- // Update attendee
- aItem.removeAttendee(att);
- aItem.addAttendee(att_);
- return true;
- }
- }
- return false;
+ let calendar = cal.wrapInstance(aItem.calendar, Components.interfaces.calISchedulingSupport);
+ if (calendar) {
+ let att = calendar.getInvitedAttendee(aItem);
+ if (att) {
+ let att_ = att.clone();
+ att_.participationStatus = aStatus;
+
+ // Update attendee
+ aItem.removeAttendee(att);
+ aItem.addAttendee(att_);
+ return true;
+ }
+ }
+ return false;
]]></body>
</method>
<method name="accept">
<body><![CDATA[
- this.participationStatus = "ACCEPTED";
+ this.participationStatus = "ACCEPTED";
]]></body>
</method>
<method name="decline">
<body><![CDATA[
- this.participationStatus = "DECLINED";
+ this.participationStatus = "DECLINED";
]]></body>
</method>
</implementation>
diff -Nru sogo-connector-60.0.1/debian/changelog sogo-connector-60.0.2/debian/changelog
--- sogo-connector-60.0.1/debian/changelog 2019-02-21 19:27:47.000000000 +0100
+++ sogo-connector-60.0.2/debian/changelog 2019-03-07 19:40:57.000000000 +0100
@@ -1,3 +1,9 @@
+sogo-connector (60.0.2-1) unstable; urgency=medium
+
+ * [747546e] New upstream version 60.0.2
+
+ -- Carsten Schoenert <c.schoenert@t-online.de> Thu, 07 Mar 2019 19:40:57 +0100
+
sogo-connector (60.0.1-1) unstable; urgency=medium
* [37adbb6] New upstream version 60.0.1
diff -Nru sogo-connector-60.0.1/install.rdf sogo-connector-60.0.2/install.rdf
--- sogo-connector-60.0.1/install.rdf 2019-02-20 14:31:59.000000000 +0100
+++ sogo-connector-60.0.2/install.rdf 2019-02-26 17:17:20.000000000 +0100
@@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest"
em:name="Inverse SOGo Connector"
em:id="sogo-connector@inverse.ca"
- em:version="60.0.1"
+ em:version="60.0.2"
em:description="A DAV plugin for keeping addressbooks and events in sync"
em:iconURL="chrome://sogo-connector/skin/addressbook/sogo.png"
em:creator="Inverse <support@inverse.ca>"
diff -Nru sogo-connector-60.0.1/RELEASE-NOTES sogo-connector-60.0.2/RELEASE-NOTES
--- sogo-connector-60.0.1/RELEASE-NOTES 2019-02-20 14:31:59.000000000 +0100
+++ sogo-connector-60.0.2/RELEASE-NOTES 2019-02-26 17:17:20.000000000 +0100
@@ -1,5 +1,7 @@
NEWS
====
+60.0.2 Fixed invitations dialog being always blank
+
60.0.0 Thunderbird 60 support
31.0.6 Fixed card editing from account preferences
Reply to: