From f0b7bccc783fef1491f1e4639f9f4c5b015981711d51b2e9c786f3bab4bc2af9 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 23 Jun 2008 19:35:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=39 --- bgo-395708_prefer-plain.patch | 48 - bgo-531519-print-preview-crash.patch | 11 - ...fix-crash-on-border-clicking-meetings.diff | 24 - bgo-534012-backup-permission.patch | 73 - ...3-evo-fix-authenticated-proxy-support.diff | 1773 ----------------- bnc-394441-exchange-addbook-crash.diff | 10 - bug-394641_evo-CVE-2008-1108.diff | 311 --- bug-394641_evo-CVE-2008-1109.diff | 62 - evolution-2.22.1.1.tar.bz2 | 3 - evolution-2.23.4.tar.bz2 | 3 + evolution-warnings.patch | 38 - evolution.changes | 54 + evolution.spec | 84 +- 13 files changed, 113 insertions(+), 2381 deletions(-) delete mode 100644 bgo-395708_prefer-plain.patch delete mode 100644 bgo-531519-print-preview-crash.patch delete mode 100644 bgo-533820-fix-crash-on-border-clicking-meetings.diff delete mode 100644 bgo-534012-backup-permission.patch delete mode 100644 bnc-188523-evo-fix-authenticated-proxy-support.diff delete mode 100644 bnc-394441-exchange-addbook-crash.diff delete mode 100644 bug-394641_evo-CVE-2008-1108.diff delete mode 100644 bug-394641_evo-CVE-2008-1109.diff delete mode 100644 evolution-2.22.1.1.tar.bz2 create mode 100644 evolution-2.23.4.tar.bz2 delete mode 100644 evolution-warnings.patch diff --git a/bgo-395708_prefer-plain.patch b/bgo-395708_prefer-plain.patch deleted file mode 100644 index d280244..0000000 --- a/bgo-395708_prefer-plain.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- plugins/prefer-plain/prefer-plain.c 2008/05/27 04:17:04 35553 -+++ plugins/prefer-plain/prefer-plain.c 2008/05/27 12:38:24 35554 -@@ -99,20 +99,41 @@ - int i, nparts, partidlen, displayid = 0; - - if (epp_mode == EPP_NORMAL) { -+ gboolean have_plain = FALSE; -+ - /* Try to find text/html part even when not as last and force to show it. - Old handler will show the last part of multipart/alternate, but if we -- can offer HTML, then offer it, regardless of position in multipart. */ -+ can offer HTML, then offer it, regardless of position in multipart. -+ But do this only when have text/plain in a list, because otherwise it -+ can be something else (like outlooks meeting invites with only text/html -+ part and calendar part). -+ */ - nparts = camel_multipart_get_number (mp); - for (i = 0; i < nparts; i++) { -+ CamelContentType *content_type; -+ - part = camel_multipart_get_part (mp, i); -- if (part && camel_content_type_is (camel_mime_part_get_content_type (part), "text", "html")) { -+ -+ if (!part) -+ continue; -+ -+ content_type = camel_mime_part_get_content_type (part); -+ -+ if (camel_content_type_is (content_type, "text", "html")) { - displayid = i; - display_part = part; -- break; -+ -+ if (have_plain) -+ break; -+ } else if (camel_content_type_is (content_type, "text", "plain")) { -+ have_plain = TRUE; -+ -+ if (display_part) -+ break; - } - } - -- if (display_part) { -+ if (display_part && have_plain) { - g_string_append_printf (t->format->part_id, ".alternative.%d", displayid); - em_format_part_as (t->format, t->stream, display_part, "text/html"); - g_string_truncate (t->format->part_id, partidlen); diff --git a/bgo-531519-print-preview-crash.patch b/bgo-531519-print-preview-crash.patch deleted file mode 100644 index cc4af16..0000000 --- a/bgo-531519-print-preview-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mail/em-format-html-display.c -+++ mail/em-format-html-display.c -@@ -2273,7 +2273,7 @@ efhd_message_update_bar(EMFormat *emf, CamelStream *stream, CamelMimePart *part, - EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *) emf; - const char *classid = "attachment-bar-refresh"; - -- if (efhd->nobar || efhd->priv->updated ) -+ if (efhd->nobar || efhd->priv->updated || !efhd->priv->attachment_bar) - return; - - efhd->priv->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); diff --git a/bgo-533820-fix-crash-on-border-clicking-meetings.diff b/bgo-533820-fix-crash-on-border-clicking-meetings.diff deleted file mode 100644 index 8d0dced..0000000 --- a/bgo-533820-fix-crash-on-border-clicking-meetings.diff +++ /dev/null @@ -1,24 +0,0 @@ -Index: calendar/gui/e-day-view.c -=================================================================== ---- calendar/gui/e-day-view.c (revision 35521) -+++ calendar/gui/e-day-view.c (working copy) -@@ -3822,6 +3822,9 @@ e_day_view_update_resize (EDayView *day_ - g_print ("Updating resize Row:%i\n", row); - #endif - -+ if (day_view->resize_event_num == -1) -+ return; -+ - day = day_view->resize_event_day; - event_num = day_view->resize_event_num; - event = &g_array_index (day_view->events[day], EDayViewEvent, -@@ -3972,6 +3975,9 @@ e_day_view_finish_resize (EDayView *day_ - CalObjModType mod = CALOBJ_MOD_ALL; - GtkWindow *toplevel; - -+ if (day_view->resize_event_num == -1) -+ return; -+ - day = day_view->resize_event_day; - event_num = day_view->resize_event_num; - event = &g_array_index (day_view->events[day], EDayViewEvent, diff --git a/bgo-534012-backup-permission.patch b/bgo-534012-backup-permission.patch deleted file mode 100644 index 7274fff..0000000 --- a/bgo-534012-backup-permission.patch +++ /dev/null @@ -1,73 +0,0 @@ -Index: plugins/backup-restore/org-gnome-backup-restore.error.xml -=================================================================== ---- plugins/backup-restore/org-gnome-backup-restore.error.xml (revision 35517) -+++ plugins/backup-restore/org-gnome-backup-restore.error.xml (working copy) -@@ -17,4 +17,8 @@ -