c4faf3231f
Copy from home:vuntz:branches:GNOME:Factory/evolution via accept of submit request 27636 revision 4. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/27636 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=55
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
Index: plugins/itip-formatter/itip-formatter.c
|
|
===================================================================
|
|
--- plugins/itip-formatter/itip-formatter.c.orig
|
|
+++ plugins/itip-formatter/itip-formatter.c
|
|
@@ -2164,6 +2164,12 @@ in_proper_folder (CamelFolder *folder)
|
|
!em_utils_folder_is_drafts (folder, uri)));
|
|
}
|
|
|
|
+ /*FIXME: GW needs to set the drafts_folder_uri and sent_folder_uri properly.
|
|
+ A workaround till then */
|
|
+ if (res && (!g_ascii_strcasecmp (folder->name, _("Sent")) ||
|
|
+ !g_ascii_strcasecmp (folder->name, _("Sent Items"))))
|
|
+ res = 0;
|
|
+
|
|
g_free (uri);
|
|
|
|
return res;
|
|
@@ -2210,6 +2216,15 @@ format_itip_object (EMFormatHTML *efh, G
|
|
|
|
response_enabled = in_proper_folder (((EMFormat*)efh)->folder);
|
|
|
|
+ /* Do not display Accept/Decline Buttons if its a forwarded meeting request */
|
|
+ if (response_enabled) {
|
|
+ CamelMimeMessage *msg = info->msg;
|
|
+ const char *subject = camel_mime_message_get_subject (msg);
|
|
+
|
|
+ if (!g_ascii_strncasecmp (subject, _("[Fwd: "), 6))
|
|
+ response_enabled = 0;
|
|
+ }
|
|
+
|
|
if (!response_enabled) {
|
|
itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_HIDE_ALL);
|
|
} else {
|