r2083 - in /unstable/evolution/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Dec 16 19:32:32 UTC 2011
Author: joss
Date: Fri Dec 16 19:32:32 2011
New Revision: 2083
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2083
Log:
10_task_from_mail.patch, 11_save_duplicate.patch,
12_sanitize_filename.patch, 13_deprecated.patch,
14_crash_importer.patch, 15_mailto_suspicious.patch,
16_none_server.patch, 17_view_threads.patch, 18_open_calendar.patch,
19_crash_bbdb.patch, 20_print_download.patch: stolen from 3.2
upstream git.
Closes: #649645 among other things.
Added:
unstable/evolution/debian/patches/10_task_from_mail.patch
unstable/evolution/debian/patches/11_save_duplicate.patch
unstable/evolution/debian/patches/12_sanitize_filename.patch
unstable/evolution/debian/patches/13_deprecated.patch
unstable/evolution/debian/patches/14_crash_importer.patch
unstable/evolution/debian/patches/15_mailto_suspicious.patch
unstable/evolution/debian/patches/16_none_server.patch
unstable/evolution/debian/patches/17_view_threads.patch
unstable/evolution/debian/patches/18_open_calendar.patch
unstable/evolution/debian/patches/19_crash_bbdb.patch
unstable/evolution/debian/patches/20_print_download.patch
Removed:
unstable/evolution/debian/patches/03_deprecated.patch
Modified:
unstable/evolution/debian/changelog
unstable/evolution/debian/patches/series
Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=2083&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Fri Dec 16 19:32:32 2011
@@ -1,4 +1,4 @@
-evolution (3.2.2-1) UNRELEASED; urgency=low
+evolution (3.2.2-1) unstable; urgency=low
[ Jordi Mallach ]
* New upstream release.
@@ -11,13 +11,18 @@
requirement, it’s not referenced anywhere in the headers.
Closes: #649646.
* Use dh-autoreconf.
- * 03_deprecated.patch: new patch. Remove *_DISABLE_DEPRECATED.
- Closes: #649645.
* 04_gettext_intltool.patch: new patch. Remove gettext from the
configure script, we already use intltool and they step on each
other’s toe.
-
- -- Jordi Mallach <jordi at debian.org> Thu, 24 Nov 2011 14:36:16 +0100
+ * 10_task_from_mail.patch, 11_save_duplicate.patch,
+ 12_sanitize_filename.patch, 13_deprecated.patch,
+ 14_crash_importer.patch, 15_mailto_suspicious.patch,
+ 16_none_server.patch, 17_view_threads.patch, 18_open_calendar.patch,
+ 19_crash_bbdb.patch, 20_print_download.patch: stolen from 3.2
+ upstream git.
+ Closes: #649645 among other things.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 16 Dec 2011 20:32:17 +0100
evolution (3.2.1-1) experimental; urgency=low
Added: unstable/evolution/debian/patches/10_task_from_mail.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/10_task_from_mail.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/10_task_from_mail.patch (added)
+++ unstable/evolution/debian/patches/10_task_from_mail.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,56 @@
+From b17398f484c3516f9a4edc597e2b719e555652da Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Mon, 21 Nov 2011 16:54:39 +0000
+Subject: Bug #664018 - Cannot create task/memo from a mail
+
+---
+diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
+index eb9e762..d8e3ada 100644
+--- a/plugins/mail-to-task/mail-to-task.c
++++ b/plugins/mail-to-task/mail-to-task.c
+@@ -1064,7 +1064,6 @@ mail_to_event (ECalClientSourceType source_type,
+ CamelFolder *folder;
+ GPtrArray *uids;
+ ESourceList *source_list = NULL;
+- gboolean done = FALSE;
+ GSList *groups, *p;
+ ESource *source = NULL, *default_source = NULL;
+ GError *error = NULL;
+@@ -1097,7 +1096,7 @@ mail_to_event (ECalClientSourceType source_type,
+
+ /* Find 'Default' source. When no source is default, ask user to pick one */
+ groups = e_source_list_peek_groups (source_list);
+- for (p = groups; p != NULL && !done; p = p->next) {
++ for (p = groups; p != NULL; p = p->next) {
+ ESourceGroup *group = E_SOURCE_GROUP (p->data);
+ GSList *sources, *q;
+
+@@ -1107,8 +1106,6 @@ mail_to_event (ECalClientSourceType source_type,
+
+ if (s && e_source_get_property (s, "default") && !e_source_get_readonly (s)) {
+ default_source = s;
+- done = TRUE;
+- break;
+ }
+
+ if (s && !e_source_get_readonly (s)) {
+@@ -1118,7 +1115,7 @@ mail_to_event (ECalClientSourceType source_type,
+ }
+ }
+
+- if (!default_source && writable_sources > 1) {
++ if (writable_sources > 1) {
+ GtkWidget *dialog;
+
+ /* ask the user which tasks list to save to */
+@@ -1134,7 +1131,7 @@ mail_to_event (ECalClientSourceType source_type,
+ gtk_widget_destroy (dialog);
+ } else if (!source && default_source) {
+ source = default_source;
+- } else {
++ } else if (!source) {
+ e_notice (NULL, GTK_MESSAGE_ERROR, _("No writable calendar is available."));
+
+ g_object_unref (source_list);
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/11_save_duplicate.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/11_save_duplicate.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/11_save_duplicate.patch (added)
+++ unstable/evolution/debian/patches/11_save_duplicate.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,47 @@
+From 90a5ed42803c77b408e22f19c8667aef602419d1 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Mon, 21 Nov 2011 17:39:36 +0000
+Subject: Bug #663615 - Saving calendar duplicates the first event
+
+---
+diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
+index d80ee25..f9d97fc 100644
+--- a/plugins/save-calendar/csv-format.c
++++ b/plugins/save-calendar/csv-format.c
+@@ -414,7 +414,7 @@ do_save_calendar_csv (FormatHandler *handler,
+ }
+
+ for (iter = objects; iter; iter = iter->next) {
+- ECalComponent *comp = objects->data;
++ ECalComponent *comp = iter->data;
+ gchar *delimiter_temp = NULL;
+ const gchar *temp_constchar;
+ GSList *temp_list;
+diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
+index f323fed..1be8ff1 100644
+--- a/plugins/save-calendar/ical-format.c
++++ b/plugins/save-calendar/ical-format.c
+@@ -128,7 +128,7 @@ do_save_calendar_ical (FormatHandler *handler,
+ tdata.client = source_client;
+
+ for (iter = objects; iter; iter = iter->next) {
+- icalcomponent *icalcomp = objects->data;
++ icalcomponent *icalcomp = iter->data;
+
+ icalcomponent_foreach_tzid (icalcomp, insert_tz_comps, &tdata);
+ icalcomponent_add_component (top_level, icalcomp);
+diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
+index c93eb1f..968a9d6 100644
+--- a/plugins/save-calendar/rdf-format.c
++++ b/plugins/save-calendar/rdf-format.c
+@@ -259,7 +259,7 @@ do_save_calendar_rdf (FormatHandler *handler,
+ xmlNewChild (fnode, NULL, (const guchar *)"version", (const guchar *)"2.0");
+
+ for (iter = objects; iter; iter = iter->next) {
+- ECalComponent *comp = objects->data;
++ ECalComponent *comp = iter->data;
+ const gchar *temp_constchar;
+ gchar *tmp_str = NULL;
+ GSList *temp_list;
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/12_sanitize_filename.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/12_sanitize_filename.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/12_sanitize_filename.patch (added)
+++ unstable/evolution/debian/patches/12_sanitize_filename.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,39 @@
+From 7d6a526b7cdc50fcaf32db8dc221979ce26d6a8a Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes at redhat.com>
+Date: Thu, 24 Nov 2011 17:02:59 +0000
+Subject: Bug 664654 - Sanitize subjects before suggesting a save filename
+
+(cherry picked from commit b2c29913cf7efc2fc74fffb26a6bfcaaa9e3c87b)
+---
+diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
+index 740960f..c35cd41 100644
+--- a/shell/e-shell-utils.c
++++ b/shell/e-shell-utils.c
+@@ -33,6 +33,8 @@
+
+ #include <glib/gi18n-lib.h>
+
++#include <libedataserver/e-data-server-util.h>
++
+ #include "widgets/misc/e-import-assistant.h"
+
+ /**
+@@ -199,8 +201,14 @@ e_shell_run_save_dialog (EShell *shell,
+ gtk_file_chooser_set_current_folder_uri (file_chooser, uri);
+ g_free (uri);
+
+- if (suggestion != NULL)
+- gtk_file_chooser_set_current_name (file_chooser, suggestion);
++ if (suggestion != NULL) {
++ gchar *current_name;
++
++ current_name = g_strdup (suggestion);
++ e_filename_make_safe (current_name);
++ gtk_file_chooser_set_current_name (file_chooser, current_name);
++ g_free (current_name);
++ }
+
+ if (filters != NULL) {
+ gchar **flts = g_strsplit (filters, ";", -1);
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/13_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/13_deprecated.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/13_deprecated.patch (added)
+++ unstable/evolution/debian/patches/13_deprecated.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,29 @@
+From 0b6d3637351cedbca318002066017609755eb51a Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes at redhat.com>
+Date: Thu, 24 Nov 2011 23:02:33 +0000
+Subject: Remove almost all *_DISABLED_DEPRECATED_FLAGS.
+
+Leave the EDS macros alone since we control them.
+
+I'll care about deprecated APIs again when a gtk4 release date is
+announced. Meanwhile it's just causing distros unnecessary pain.
+
+(cherry picked from commit b2022f6d3c01ba651b91aa8734274e2093997461)
+---
+diff --git a/configure.ac b/configure.ac
+index ddff758..9d5515a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,9 +68,7 @@ dnl ******************************
+ dnl Compiler Warning Flags
+ dnl ******************************
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+- "-DPANGO_DISABLE_DEPRECATED
+- -DGDK_PIXBUF_DISABLE_DEPRECATED
+- -DEDS_DISABLE_DEPRECATED
++ "-DEDS_DISABLE_DEPRECATED
+ -DG_DISABLE_SINGLE_INCLUDES
+ -DGTK_DISABLE_SINGLE_INCLUDES
+ -DE_BOOK_DISABLE_DEPRECATED
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/14_crash_importer.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/14_crash_importer.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/14_crash_importer.patch (added)
+++ unstable/evolution/debian/patches/14_crash_importer.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,28 @@
+From 64968a87f30369533a5c49631ef1df63b11b6da3 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Tue, 29 Nov 2011 12:11:13 +0000
+Subject: Bug #665123 - Incorrect unref of ESource in pine-importer
+
+---
+diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
+index 710e02b..ef39bcf 100644
+--- a/mail/importers/pine-importer.c
++++ b/mail/importers/pine-importer.c
+@@ -214,7 +214,6 @@ import_contacts (void)
+ }
+
+ if (!e_client_open_sync (E_CLIENT (book_client), TRUE, NULL, &error)) {
+- g_object_unref (primary);
+ g_object_unref (source_list);
+ fclose (fp);
+
+@@ -225,7 +224,6 @@ import_contacts (void)
+ g_error_free (error);
+ return;
+ }
+- g_object_unref (primary);
+ g_object_unref (source_list);
+
+ line = g_string_new("");
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/15_mailto_suspicious.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/15_mailto_suspicious.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/15_mailto_suspicious.patch (added)
+++ unstable/evolution/debian/patches/15_mailto_suspicious.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,65 @@
+From 588c410718068388f8ce0004a71c104a4c89cce3 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes at redhat.com>
+Date: Wed, 30 Nov 2011 13:24:20 +0000
+Subject: Bug 657374 - mailto: attachment parameter can lead to accidental data exfiltration
+
+---
+diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
+index c41c401..ceff107 100644
+--- a/composer/e-msg-composer.c
++++ b/composer/e-msg-composer.c
+@@ -4003,6 +4003,35 @@ merge_always_cc_and_bcc (EComposerHeaderTable *table,
+ e_destination_freev (addrv);
+ }
+
++static const gchar *blacklist[] = { ".", "etc", ".." };
++
++static gboolean
++file_is_blacklisted (const gchar *filename)
++{
++ gboolean blacklisted = FALSE;
++ guint ii, jj, n_parts;
++ gchar **parts;
++
++ parts = g_strsplit (filename, G_DIR_SEPARATOR_S, -1);
++ n_parts = g_strv_length (parts);
++
++ for (ii = 0; ii < G_N_ELEMENTS (blacklist); ii++) {
++ for (jj = 0; jj < n_parts; jj++) {
++ if (g_str_has_prefix (parts[jj], blacklist[ii])) {
++ blacklisted = TRUE;
++ break;
++ }
++ }
++ }
++
++ g_strfreev (parts);
++
++ if (blacklisted)
++ g_message ("Skipping suspicious attachment: %s", filename);
++
++ return blacklisted;
++}
++
+ static void
+ handle_mailto (EMsgComposer *composer,
+ const gchar *mailto)
+@@ -4096,6 +4125,8 @@ handle_mailto (EMsgComposer *composer,
+ EAttachment *attachment;
+
+ camel_url_decode (content);
++ if (file_is_blacklisted (content))
++ goto next;
+ if (g_ascii_strncasecmp (content, "file:", 5) == 0)
+ attachment = e_attachment_new_for_uri (content);
+ else
+@@ -4115,6 +4146,7 @@ handle_mailto (EMsgComposer *composer,
+ e_msg_composer_add_header (composer, header, content);
+ }
+
++next:
+ g_free (content);
+
+ p += clen;
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/16_none_server.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/16_none_server.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/16_none_server.patch (added)
+++ unstable/evolution/debian/patches/16_none_server.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,28 @@
+From aebff18175e96d52adb3608c788bd2bf1e916ad0 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 30 Nov 2011 18:03:08 +0000
+Subject: Bug #662789 - Can't create account with None receiving server type
+
+---
+diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
+index b9589d5..3f8c1ae 100644
+--- a/mail/em-account-editor.c
++++ b/mail/em-account-editor.c
+@@ -3890,13 +3890,13 @@ emae_check_complete (EConfig *ec,
+ user[at - tmp] = 0;
+ at++;
+
++ refresh = TRUE;
++
+ sdata = emae->priv->selected_server;
+ if (sdata != NULL && uri && (url = camel_url_new (uri, NULL)) != NULL) {
+ CamelNetworkSecurityMethod method;
+ const gchar *use_user = user;
+
+- refresh = TRUE;
+-
+ if (sdata->send_security_method != CAMEL_NETWORK_SECURITY_METHOD_NONE)
+ method = sdata->send_security_method;
+ else
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/17_view_threads.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/17_view_threads.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/17_view_threads.patch (added)
+++ unstable/evolution/debian/patches/17_view_threads.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,43 @@
+From 23bc4bd3ce69e2c8dc5a10c58b0aae34c118b68c Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Tue, 13 Dec 2011 08:15:49 +0000
+Subject: Bug #578245 - View settings for threads getting lost
+
+---
+diff --git a/mail/message-list.c b/mail/message-list.c
+index d98f860..3a90848 100644
+--- a/mail/message-list.c
++++ b/mail/message-list.c
+@@ -5038,6 +5038,7 @@ mail_regen_list (MessageList *ml,
+ GConfClient *client;
+ const gchar *key;
+ gboolean thread_subject;
++ gboolean searching;
+
+ /* report empty search as NULL, not as one/two-space string */
+ if (search && (strcmp (search, " ") == 0 || strcmp (search, " ") == 0))
+@@ -5092,6 +5093,8 @@ mail_regen_list (MessageList *ml,
+ camel_folder_thread_messages_ref (m->tree);
+ }
+
++ searching = ml->search && *ml->search && !g_str_equal (ml->search, " ");
++
+ if (e_tree_row_count (E_TREE (ml)) <= 0) {
+ if (gtk_widget_get_visible (GTK_WIDGET (ml))) {
+ /* there is some info why the message list is empty, let it be something useful */
+@@ -5101,11 +5104,11 @@ mail_regen_list (MessageList *ml,
+
+ g_free (txt);
+ }
+- } else if (ml->priv->any_row_changed && m->dotree && !ml->just_set_folder && (!ml->search || g_str_equal (ml->search, " "))) {
++ } else if (ml->priv->any_row_changed && m->dotree && !ml->just_set_folder && !searching) {
+ /* there has been some change on any row, if it was an expand state change,
+ * then let it save; if not, then nothing happen. */
+ message_list_save_state (ml);
+- } else if (m->dotree && !ml->just_set_folder) {
++ } else if (m->dotree && !ml->just_set_folder && !searching) {
+ /* remember actual expand state and restore it after regen */
+ m->expand_state = e_tree_save_expanded_state_xml (E_TREE (ml));
+ }
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/18_open_calendar.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/18_open_calendar.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/18_open_calendar.patch (added)
+++ unstable/evolution/debian/patches/18_open_calendar.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,47 @@
+From 38a1e0e3d3fe5a379bd6ff7b8a5864a8d6d1cce4 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Thu, 15 Dec 2011 10:32:45 +0000
+Subject: Bug #561696 - Invitation's "Open Calendar" button jumps to current day
+
+---
+diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
+index 96077cf..cc7c611 100644
+--- a/modules/calendar/e-cal-shell-backend.c
++++ b/modules/calendar/e-cal-shell-backend.c
+@@ -552,7 +552,7 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
+
+ header = (gchar *) cp;
+ header[header_len] = '\0';
+- cp += header_len + 2;
++ cp += header_len + 1;
+
+ content_len = strcspn (cp, "&");
+
+@@ -573,10 +573,10 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
+ comp_rid = g_strdup (content);
+ g_free (content);
+
+- cp += content_len + 1;
++ cp += content_len;
+ if (*cp == '&') {
+ cp++;
+- if (strcmp (cp, "amp;") == 0)
++ if (strncmp (cp, "amp;", 4) == 0)
+ cp += 4;
+ }
+ }
+diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
+index 189362c..37e398f 100644
+--- a/plugins/itip-formatter/itip-formatter.c
++++ b/plugins/itip-formatter/itip-formatter.c
+@@ -2205,7 +2205,7 @@ idle_open_cb (gpointer data)
+ start = isodate_from_time_t (pitip->start_time);
+ end = isodate_from_time_t (pitip->end_time);
+ m = mail_msg_new (&open_calendar_info);
+- m->command = g_strdup_printf ("evolution \"calendar:///?startdate=&%s&enddate=&%s\"", start, end);
++ m->command = g_strdup_printf ("evolution \"calendar:///?startdate=%s&enddate=%s\"", start, end);
+ mail_msg_slow_ordered_push (m);
+
+ g_free (start);
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/19_crash_bbdb.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/19_crash_bbdb.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/19_crash_bbdb.patch (added)
+++ unstable/evolution/debian/patches/19_crash_bbdb.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,20 @@
+From 4299a122fadd3ad32f53b8f5f1a916863ab95e26 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Fri, 16 Dec 2011 09:23:57 +0000
+Subject: Bug #666341 - [bbdb] Invalid free in bbdb_do_it
+
+---
+diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
+index d24e754..af6c072 100644
+--- a/plugins/bbdb/bbdb.c
++++ b/plugins/bbdb/bbdb.c
+@@ -400,7 +400,6 @@ bbdb_do_it (EBookClient *client,
+
+ e_client_util_free_object_slist (contacts);
+ g_free (temp_name);
+- g_free (uid);
+ return;
+ }
+
+--
+cgit v0.9.0.2
Added: unstable/evolution/debian/patches/20_print_download.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/20_print_download.patch?rev=2083&op=file
==============================================================================
--- unstable/evolution/debian/patches/20_print_download.patch (added)
+++ unstable/evolution/debian/patches/20_print_download.patch Fri Dec 16 19:32:32 2011
@@ -1,0 +1,21 @@
+From 6228c1358a1fcdc4226c0130067002db09ebcb58 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Fri, 16 Dec 2011 09:53:43 +0000
+Subject: Bug #661043 - Printing causes email images to download
+
+---
+diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
+index dbfe011..7c852da 100644
+--- a/mail/em-format-html-print.c
++++ b/mail/em-format-html-print.c
+@@ -237,8 +237,6 @@ em_format_html_print_message (EMFormatHTMLPrint *efhp,
+ EM_FORMAT_HTML_HEADER_CC |
+ EM_FORMAT_HTML_HEADER_BCC;
+
+- em_format_html_load_images (EM_FORMAT_HTML (efhp));
+-
+ g_signal_connect (
+ efhp, "complete", G_CALLBACK (emfhp_complete), efhp);
+
+--
+cgit v0.9.0.2
Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=2083&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series (original)
+++ unstable/evolution/debian/patches/series Fri Dec 16 19:32:32 2011
@@ -1,3 +1,13 @@
01_requires_private.patch
-03_deprecated.patch
04_gettext_intltool.patch
+10_task_from_mail.patch
+11_save_duplicate.patch
+12_sanitize_filename.patch
+13_deprecated.patch
+14_crash_importer.patch
+15_mailto_suspicious.patch
+16_none_server.patch
+17_view_threads.patch
+18_open_calendar.patch
+19_crash_bbdb.patch
+20_print_download.patch
More information about the pkg-evolution-commits
mailing list