diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 8ce68a9bdca..8c889edead3 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.226 2014/04/11 10:00:17 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.227 2014/04/13 16:14:19 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= integrated email and PIM software for GNOME GNOME_PROJECT= evolution -GNOME_VERSION= 3.12.0 -REVISION= 3 +GNOME_VERSION= 3.12.1 # NOTE: when EVO_VERSION changes, increment accordingly and bump: # mail/evolution-ews diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index f0394ef562d..d044e7d829e 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,2 +1,2 @@ -SHA256 (evolution-3.12.0.tar.xz) = /Yz5gydcZnM/sN/OpEnOkLucX04z6tEqvktNAnKckeU= -SIZE (evolution-3.12.0.tar.xz) = 12125008 +SHA256 (evolution-3.12.1.tar.xz) = pLUFioKUnog5VoY9I/1lzU6J1qH7GNTTWz3a9EZL9So= +SIZE (evolution-3.12.1.tar.xz) = 12111704 diff --git a/mail/evolution/patches/patch-addressbook_gui_contact-editor_e-contact-editor_c b/mail/evolution/patches/patch-addressbook_gui_contact-editor_e-contact-editor_c deleted file mode 100644 index b12eb95e47e..00000000000 --- a/mail/evolution/patches/patch-addressbook_gui_contact-editor_e-contact-editor_c +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-addressbook_gui_contact-editor_e-contact-editor_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From acdcfe136fb0dc0073b0b5ea0a3d82dddcdbe95f Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 09:25:18 +0200 -Subject: Bug #727967 - Undo/Redo text is not displayed in menus - ---- addressbook/gui/contact-editor/e-contact-editor.c.orig Mon Mar 3 01:37:23 2014 -+++ addressbook/gui/contact-editor/e-contact-editor.c Fri Apr 11 11:12:25 2014 -@@ -266,14 +266,14 @@ static GtkActionEntry undo_entries[] = { - - { "undo", - "edit-undo", -- NULL, -+ N_("Undo"), - "z", - N_("Undo"), - NULL }, /* Handled by EFocusTracker */ - - { "redo", - "edit-redo", -- NULL, -+ N_("Redo"), - "y", - N_("Redo"), - NULL } /* Handled by EFocusTracker */ diff --git a/mail/evolution/patches/patch-addressbook_gui_widgets_e-minicard_c b/mail/evolution/patches/patch-addressbook_gui_widgets_e-minicard_c deleted file mode 100644 index 76a6a09f855..00000000000 --- a/mail/evolution/patches/patch-addressbook_gui_widgets_e-minicard_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-addressbook_gui_widgets_e-minicard_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 30bb3576c607f49ee5b0f1c9c625e6d41c486838 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Mon, 24 Mar 2014 16:21:49 +0100 -Subject: Bug #726110 - Use gtk_drag_check_threshold() instead of hard-coded - ---- addressbook/gui/widgets/e-minicard.c.orig Mon Mar 3 01:37:23 2014 -+++ addressbook/gui/widgets/e-minicard.c Tue Apr 8 16:35:05 2014 -@@ -630,8 +630,9 @@ e_minicard_event (GnomeCanvasItem *item, - break; - case GDK_MOTION_NOTIFY: - if (e_minicard->drag_button_down && event->motion.state & GDK_BUTTON1_MASK) { -- if (MAX (abs (e_minicard->button_x - event->motion.x), -- abs (e_minicard->button_y - event->motion.y)) > 3) { -+ if (gtk_drag_check_threshold (GTK_WIDGET (item->canvas), -+ e_minicard->button_x, e_minicard->button_y, -+ event->motion.x, event->motion.y)) { - gint ret_val; - - ret_val = e_minicard_drag_begin (e_minicard, event); diff --git a/mail/evolution/patches/patch-calendar_alarm-notify_alarm-notify_ui b/mail/evolution/patches/patch-calendar_alarm-notify_alarm-notify_ui deleted file mode 100644 index 5c9d44b093b..00000000000 --- a/mail/evolution/patches/patch-calendar_alarm-notify_alarm-notify_ui +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-calendar_alarm-notify_alarm-notify_ui,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From d1b43cb9d4f084d45e53347a84af674f75c3d9e5 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 08:29:03 +0200 -Subject: Bug #727888 - Wrap the Location label in a reminder dialog - ---- calendar/alarm-notify/alarm-notify.ui.orig Sun Feb 16 15:11:01 2014 -+++ calendar/alarm-notify/alarm-notify.ui Fri Apr 11 11:11:52 2014 -@@ -230,7 +230,9 @@ - True - False - start -+ start - 0 -+ 0 - Location: - True - -@@ -244,6 +246,8 @@ - - - True -+ True -+ 80 - False - start - 0 diff --git a/mail/evolution/patches/patch-calendar_gui_dialogs_comp-editor_c b/mail/evolution/patches/patch-calendar_gui_dialogs_comp-editor_c deleted file mode 100644 index 2a2be1baa26..00000000000 --- a/mail/evolution/patches/patch-calendar_gui_dialogs_comp-editor_c +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-calendar_gui_dialogs_comp-editor_c,v 1.2 2014/04/11 10:00:17 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - -From acdcfe136fb0dc0073b0b5ea0a3d82dddcdbe95f Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 09:25:18 +0200 -Subject: Bug #727967 - Undo/Redo text is not displayed in menus - ---- calendar/gui/dialogs/comp-editor.c.orig Mon Mar 3 01:37:23 2014 -+++ calendar/gui/dialogs/comp-editor.c Fri Apr 11 11:12:25 2014 -@@ -1296,14 +1296,14 @@ static GtkActionEntry core_entries[] = { - - { "undo", - "edit-undo", -- NULL, -+ N_("Undo"), - "z", - N_("Undo"), - NULL }, /* Handled by EFocusTracker */ - - { "redo", - "edit-redo", -- NULL, -+ N_("Redo"), - "y", - N_("Redo"), - NULL }, /* Handled by EFocusTracker */ -@@ -2283,6 +2283,7 @@ comp_editor_init (CompEditor *editor) - - widget = gtk_notebook_new (); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), express_mode); -+ gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE); - gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); - priv->notebook = GTK_NOTEBOOK (widget); - gtk_widget_show (widget); diff --git a/mail/evolution/patches/patch-calendar_gui_e-calendar-view_c b/mail/evolution/patches/patch-calendar_gui_e-calendar-view_c deleted file mode 100644 index 14bc8b6b603..00000000000 --- a/mail/evolution/patches/patch-calendar_gui_e-calendar-view_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-calendar_gui_e-calendar-view_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From d1b43cb9d4f084d45e53347a84af674f75c3d9e5 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 08:29:03 +0200 -Subject: Bug #727888 - Wrap the Location label in a reminder dialog - ---- calendar/gui/e-calendar-view.c.orig Thu Mar 13 14:43:23 2014 -+++ calendar/gui/e-calendar-view.c Fri Apr 11 11:11:52 2014 -@@ -2113,7 +2113,11 @@ e_calendar_view_get_tooltips (const ECalendarViewEvent - /* To Translators: It will display "Location: PlaceOfTheMeeting" */ - tmp = g_markup_printf_escaped (_("Location: %s"), str); - label = gtk_label_new (NULL); -+ gtk_widget_set_halign (label, GTK_ALIGN_START); -+ gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.0); - gtk_label_set_markup ((GtkLabel *) label, tmp); -+ gtk_label_set_line_wrap ((GtkLabel *) label, TRUE); -+ gtk_label_set_max_width_chars ((GtkLabel *) label, 80); - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 0); - ebox = gtk_event_box_new (); diff --git a/mail/evolution/patches/patch-calendar_gui_e-day-view_c b/mail/evolution/patches/patch-calendar_gui_e-day-view_c deleted file mode 100644 index f9fff913234..00000000000 --- a/mail/evolution/patches/patch-calendar_gui_e-day-view_c +++ /dev/null @@ -1,44 +0,0 @@ -$OpenBSD: patch-calendar_gui_e-day-view_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 30bb3576c607f49ee5b0f1c9c625e6d41c486838 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Mon, 24 Mar 2014 16:21:49 +0100 -Subject: Bug #726110 - Use gtk_drag_check_threshold() instead of hard-coded - ---- calendar/gui/e-day-view.c.orig Thu Mar 13 14:43:23 2014 -+++ calendar/gui/e-day-view.c Tue Apr 8 16:35:05 2014 -@@ -75,10 +75,6 @@ - /* The number of timeouts we skip before we start scrolling. */ - #define E_DAY_VIEW_AUTO_SCROLL_DELAY 5 - --/* The number of pixels the mouse has to be moved with the button down before -- * we start a drag. */ --#define E_DAY_VIEW_DRAG_START_OFFSET 4 -- - /* The amount we scroll the main canvas when the Page Up/Down keys are pressed, - * as a fraction of the page size. */ - #define E_DAY_VIEW_PAGE_STEP 0.5 -@@ -4669,10 +4665,7 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget, - return FALSE; - - if (!e_cal_util_component_has_recurrences (event->comp_data->icalcomp) -- && (abs (canvas_x - day_view->drag_event_x) -- > E_DAY_VIEW_DRAG_START_OFFSET -- || abs (canvas_y - day_view->drag_event_y) -- > E_DAY_VIEW_DRAG_START_OFFSET)) { -+ && gtk_drag_check_threshold (widget, day_view->drag_event_x, day_view->drag_event_y, canvas_x, canvas_y)) { - day_view->drag_event_day = day_view->pressed_event_day; - day_view->drag_event_num = day_view->pressed_event_num; - day_view->pressed_event_day = -1; -@@ -4781,10 +4774,7 @@ e_day_view_on_main_canvas_motion (GtkWidget *widget, - && day_view->pressed_event_day != E_DAY_VIEW_LONG_EVENT) { - GtkTargetList *target_list; - -- if ((abs (canvas_x - day_view->drag_event_x) -- > E_DAY_VIEW_DRAG_START_OFFSET -- || abs (canvas_y - day_view->drag_event_y) -- > E_DAY_VIEW_DRAG_START_OFFSET)) { -+ if (gtk_drag_check_threshold (widget, day_view->drag_event_x, day_view->drag_event_y, canvas_x, canvas_y)) { - day_view->drag_event_day = day_view->pressed_event_day; - day_view->drag_event_num = day_view->pressed_event_num; - day_view->pressed_event_day = -1; diff --git a/mail/evolution/patches/patch-calendar_importers_icalendar-importer_c b/mail/evolution/patches/patch-calendar_importers_icalendar-importer_c deleted file mode 100644 index ca036e1d773..00000000000 --- a/mail/evolution/patches/patch-calendar_importers_icalendar-importer_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-calendar_importers_icalendar-importer_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - ---- calendar/importers/icalendar-importer.c.orig Tue Jan 7 22:05:51 2014 -+++ calendar/importers/icalendar-importer.c Tue Apr 8 16:39:37 2014 -@@ -303,6 +303,7 @@ ivcal_getwidget (EImport *ei, - - nb = gtk_notebook_new (); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nb), FALSE); -+ gtk_notebook_set_show_border (GTK_NOTEBOOK (nb), FALSE); - gtk_box_pack_start (GTK_BOX (vbox), nb, TRUE, TRUE, 6); - - /* Type of icalendar items */ diff --git a/mail/evolution/patches/patch-e-util_e-config_c b/mail/evolution/patches/patch-e-util_e-config_c deleted file mode 100644 index b2f4360aeaa..00000000000 --- a/mail/evolution/patches/patch-e-util_e-config_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-e-util_e-config_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - ---- e-util/e-config.c.orig Sun Feb 2 17:55:09 2014 -+++ e-util/e-config.c Tue Apr 8 16:39:37 2014 -@@ -420,6 +420,7 @@ ec_rebuild (EConfig *config) - 0, wn->context->data); - } else { - root = gtk_notebook_new (); -+ gtk_notebook_set_show_border (GTK_NOTEBOOK (root), FALSE); - gtk_widget_show (root); - } - diff --git a/mail/evolution/patches/patch-e-util_e-file-request_c b/mail/evolution/patches/patch-e-util_e-file-request_c deleted file mode 100644 index 9a43902f5d5..00000000000 --- a/mail/evolution/patches/patch-e-util_e-file-request_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-e-util_e-file-request_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 162f568fde4c87b4105abb3897dc633791c794b7 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 4 Apr 2014 15:37:13 +0200 -Subject: Fix few more memory leaks - ---- e-util/e-file-request.c.orig Tue Jan 7 22:05:51 2014 -+++ e-util/e-file-request.c Tue Apr 8 16:41:48 2014 -@@ -60,7 +60,7 @@ handle_file_request (GSimpleAsyncResult *res, - - stream = g_memory_input_stream_new_from_data ( - contents, length, (GDestroyNotify) g_free); -- g_simple_async_result_set_op_res_gpointer (res, stream, NULL); -+ g_simple_async_result_set_op_res_gpointer (res, stream, g_object_unref); - } - } - -@@ -130,6 +130,8 @@ file_request_send_finish (SoupRequest *request, - - if (!stream) /* We must always return something */ - stream = g_memory_input_stream_new (); -+ else -+ g_object_ref (stream); - - return stream; - } diff --git a/mail/evolution/patches/patch-e-util_e-misc-utils_c b/mail/evolution/patches/patch-e-util_e-misc-utils_c deleted file mode 100644 index db8cb824b3b..00000000000 --- a/mail/evolution/patches/patch-e-util_e-misc-utils_c +++ /dev/null @@ -1,94 +0,0 @@ -$OpenBSD: patch-e-util_e-misc-utils_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- e-util/e-misc-utils.c.orig Tue Feb 11 14:39:16 2014 -+++ e-util/e-misc-utils.c Fri Apr 11 11:13:32 2014 -@@ -2102,3 +2102,84 @@ e_binding_transform_uid_to_source (GBinding *binding, - - return success; - } -+ -+/** -+ * e_binding_transform_text_non_null: -+ * @binding: a #GBinding -+ * @source_value: a #GValue of type #G_TYPE_STRING -+ * @target_value: a #GValue of type #G_TYPE_STRING -+ * @user_data: custom user data, unused -+ * -+ * Transforms a text value to a text value which is never NULL; -+ * an empty string is used instead of NULL. -+ * -+ * Returns: %TRUE on success -+ **/ -+gboolean -+e_binding_transform_text_non_null (GBinding *binding, -+ const GValue *source_value, -+ GValue *target_value, -+ gpointer user_data) -+{ -+ const gchar *str; -+ -+ g_return_val_if_fail (G_IS_BINDING (binding), FALSE); -+ g_return_val_if_fail (source_value != NULL, FALSE); -+ g_return_val_if_fail (target_value != NULL, FALSE); -+ -+ str = g_value_get_string (source_value); -+ if (!str) -+ str = ""; -+ -+ g_value_set_string (target_value, str); -+ -+ return TRUE; -+} -+ -+/** -+ * e_binding_bind_object_text_property: -+ * @source: the source #GObject -+ * @source_property: the text property on the source to bind -+ * @target: the target #GObject -+ * @target_property: the text property on the target to bind -+ * @flags: flags to pass to g_object_bind_property_full() -+ * -+ * Installs a new text property object binding, using g_object_bind_property_full(), -+ * with transform functions to make sure that a NULL pointer is not -+ * passed in either way. Instead of NULL an empty string is used. -+ * -+ * Returns: the #GBinding instance representing the binding between the two #GObject instances; -+ * there applies the same rules to it as for the result of g_object_bind_property_full(). -+ **/ -+GBinding * -+e_binding_bind_object_text_property (gpointer source, -+ const gchar *source_property, -+ gpointer target, -+ const gchar *target_property, -+ GBindingFlags flags) -+{ -+ GObjectClass *klass; -+ GParamSpec *property; -+ -+ g_return_val_if_fail (G_IS_OBJECT (source), NULL); -+ g_return_val_if_fail (source_property != NULL, NULL); -+ g_return_val_if_fail (G_IS_OBJECT (target), NULL); -+ g_return_val_if_fail (target_property != NULL, NULL); -+ -+ klass = G_OBJECT_GET_CLASS (source); -+ property = g_object_class_find_property (klass, source_property); -+ g_return_val_if_fail (property != NULL, NULL); -+ g_return_val_if_fail (property->value_type == G_TYPE_STRING, NULL); -+ -+ klass = G_OBJECT_GET_CLASS (target); -+ property = g_object_class_find_property (klass, target_property); -+ g_return_val_if_fail (property != NULL, NULL); -+ g_return_val_if_fail (property->value_type == G_TYPE_STRING, NULL); -+ -+ return g_object_bind_property_full (source, source_property, -+ target, target_property, -+ flags, -+ e_binding_transform_text_non_null, -+ e_binding_transform_text_non_null, -+ NULL, NULL); -+} diff --git a/mail/evolution/patches/patch-e-util_e-misc-utils_h b/mail/evolution/patches/patch-e-util_e-misc-utils_h deleted file mode 100644 index e64eb22ebf9..00000000000 --- a/mail/evolution/patches/patch-e-util_e-misc-utils_h +++ /dev/null @@ -1,29 +0,0 @@ -$OpenBSD: patch-e-util_e-misc-utils_h,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- e-util/e-misc-utils.h.orig Mon Mar 3 01:37:23 2014 -+++ e-util/e-misc-utils.h Fri Apr 11 11:13:32 2014 -@@ -184,6 +184,19 @@ gboolean e_binding_transform_uid_to_source - GValue *target_value, - ESourceRegistry *registry); - -+gboolean e_binding_transform_text_non_null -+ (GBinding *binding, -+ const GValue *source_value, -+ GValue *target_value, -+ gpointer user_data); -+ -+GBinding * e_binding_bind_object_text_property -+ (gpointer source, -+ const gchar *source_property, -+ gpointer target, -+ const gchar *target_property, -+ GBindingFlags flags); -+ - G_END_DECLS - - #endif /* E_MISC_UTILS_H */ diff --git a/mail/evolution/patches/patch-e-util_e-photo-cache_c b/mail/evolution/patches/patch-e-util_e-photo-cache_c deleted file mode 100644 index e981cade21f..00000000000 --- a/mail/evolution/patches/patch-e-util_e-photo-cache_c +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-e-util_e-photo-cache_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 7a060d5b60236cdfda4218f390a3d0cb23d06882 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 25 Mar 2014 14:14:02 +0100 -Subject: EPhotoCache: Fix a memory leak - ---- e-util/e-photo-cache.c.orig Tue Jan 7 22:05:51 2014 -+++ e-util/e-photo-cache.c Tue Apr 8 16:36:10 2014 -@@ -774,9 +774,10 @@ photo_cache_finalize (GObject *object) - g_main_context_unref (priv->main_context); - - g_hash_table_destroy (priv->photo_ht); -+ g_hash_table_destroy (priv->sources_ht); - -- g_mutex_lock (&priv->photo_ht_lock); -- g_mutex_lock (&priv->sources_ht_lock); -+ g_mutex_clear (&priv->photo_ht_lock); -+ g_mutex_clear (&priv->sources_ht_lock); - - /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (e_photo_cache_parent_class)->finalize (object); diff --git a/mail/evolution/patches/patch-e-util_e-send-options_c b/mail/evolution/patches/patch-e-util_e-send-options_c deleted file mode 100644 index 345fbf1331f..00000000000 --- a/mail/evolution/patches/patch-e-util_e-send-options_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-e-util_e-send-options_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - ---- e-util/e-send-options.c.orig Mon Mar 3 01:37:23 2014 -+++ e-util/e-send-options.c Tue Apr 8 16:39:37 2014 -@@ -516,6 +516,7 @@ setup_widgets (ESendOptionsDialog *sod, - - priv = sod->priv; - -+ gtk_notebook_set_show_border (priv->notebook, FALSE); - if (!priv->gopts_needed) { - gtk_notebook_set_show_tabs (priv->notebook, FALSE); - gtk_notebook_set_current_page (priv->notebook, 1); diff --git a/mail/evolution/patches/patch-e-util_e-source-config_c b/mail/evolution/patches/patch-e-util_e-source-config_c deleted file mode 100644 index dcf14f77acd..00000000000 --- a/mail/evolution/patches/patch-e-util_e-source-config_c +++ /dev/null @@ -1,41 +0,0 @@ -$OpenBSD: patch-e-util_e-source-config_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- e-util/e-source-config.c.orig Tue Jan 7 22:05:51 2014 -+++ e-util/e-source-config.c Fri Apr 11 11:13:32 2014 -@@ -24,6 +24,7 @@ - - #include "e-interval-chooser.h" - #include "e-marshal.h" -+#include "e-misc-utils.h" - #include "e-source-config-backend.h" - - #define E_SOURCE_CONFIG_GET_PRIVATE(obj) \ -@@ -769,12 +770,12 @@ static void - source_config_init_candidate (ESourceConfig *config, - ESource *scratch_source) - { -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - scratch_source, "display-name", - config->priv->name_label, "label", - G_BINDING_SYNC_CREATE); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - scratch_source, "display-name", - config->priv->name_entry, "text", - G_BINDING_BIDIRECTIONAL | -@@ -1463,7 +1464,7 @@ e_source_config_add_user_entry (ESourceConfig *config, - config, scratch_source, _("User"), widget); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "user", - widget, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-e-util_e-table-column-specification_c b/mail/evolution/patches/patch-e-util_e-table-column-specification_c deleted file mode 100644 index 10301e4012b..00000000000 --- a/mail/evolution/patches/patch-e-util_e-table-column-specification_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-e-util_e-table-column-specification_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From afe39b84353ed091828fe704cf127a21f492b415 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Wed, 26 Mar 2014 16:48:03 +0100 -Subject: Fix two memory leaks - ---- e-util/e-table-column-specification.c.orig Mon Mar 3 01:37:23 2014 -+++ e-util/e-table-column-specification.c Tue Apr 8 16:38:00 2014 -@@ -72,7 +72,7 @@ e_table_column_specification_init (ETableColumnSpecifi - { - specification->model_col = 0; - specification->compare_col = 0; -- specification->title = g_strdup (""); -+ specification->title = NULL; - specification->pixbuf = NULL; - - specification->expansion = 0; diff --git a/mail/evolution/patches/patch-e-util_e-table-field-chooser-item_c b/mail/evolution/patches/patch-e-util_e-table-field-chooser-item_c deleted file mode 100644 index af9fbc6f870..00000000000 --- a/mail/evolution/patches/patch-e-util_e-table-field-chooser-item_c +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-e-util_e-table-field-chooser-item_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 30bb3576c607f49ee5b0f1c9c625e6d41c486838 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Mon, 24 Mar 2014 16:21:49 +0100 -Subject: Bug #726110 - Use gtk_drag_check_threshold() instead of hard-coded - ---- e-util/e-table-field-chooser-item.c.orig Mon Mar 3 01:37:23 2014 -+++ e-util/e-table-field-chooser-item.c Tue Apr 8 16:35:05 2014 -@@ -549,14 +549,14 @@ etfci_maybe_start_drag (ETableFieldChooserItem *etfci, - gint x, - gint y) - { -+ GnomeCanvasItem *item; -+ - if (!etfci->maybe_drag) - return FALSE; - -- if (MAX (abs (etfci->click_x - x), -- abs (etfci->click_y - y)) <= 3) -- return FALSE; -+ item = GNOME_CANVAS_ITEM (etfci); - -- return TRUE; -+ return gtk_drag_check_threshold (GTK_WIDGET (item->canvas), etfci->click_x, etfci->click_y, x, y); - } - - static void diff --git a/mail/evolution/patches/patch-e-util_e-table-header-item_c b/mail/evolution/patches/patch-e-util_e-table-header-item_c deleted file mode 100644 index 365a5dd45a8..00000000000 --- a/mail/evolution/patches/patch-e-util_e-table-header-item_c +++ /dev/null @@ -1,32 +0,0 @@ -$OpenBSD: patch-e-util_e-table-header-item_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 30bb3576c607f49ee5b0f1c9c625e6d41c486838 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Mon, 24 Mar 2014 16:21:49 +0100 -Subject: Bug #726110 - Use gtk_drag_check_threshold() instead of hard-coded - ---- e-util/e-table-header-item.c.orig Mon Mar 3 01:37:23 2014 -+++ e-util/e-table-header-item.c Tue Apr 8 16:35:05 2014 -@@ -1202,6 +1202,8 @@ static gboolean - ethi_maybe_start_drag (ETableHeaderItem *ethi, - GdkEventMotion *event) - { -+ GnomeCanvasItem *item; -+ - if (!ethi->maybe_drag) - return FALSE; - -@@ -1210,11 +1212,9 @@ ethi_maybe_start_drag (ETableHeaderItem *ethi, - return FALSE; - } - -- if (MAX (abs (ethi->click_x - event->x), -- abs (ethi->click_y - event->y)) <= 3) -- return FALSE; -+ item = GNOME_CANVAS_ITEM (ethi); - -- return TRUE; -+ return gtk_drag_check_threshold (GTK_WIDGET (item->canvas), ethi->click_x, ethi->click_y, event->x, event->y); - } - - static void diff --git a/mail/evolution/patches/patch-e-util_e-table-item_c b/mail/evolution/patches/patch-e-util_e-table-item_c deleted file mode 100644 index 74327449b9d..00000000000 --- a/mail/evolution/patches/patch-e-util_e-table-item_c +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-e-util_e-table-item_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 30bb3576c607f49ee5b0f1c9c625e6d41c486838 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Mon, 24 Mar 2014 16:21:49 +0100 -Subject: Bug #726110 - Use gtk_drag_check_threshold() instead of hard-coded - ---- e-util/e-table-item.c.orig Fri Mar 7 19:15:31 2014 -+++ e-util/e-table-item.c Tue Apr 8 16:35:05 2014 -@@ -2745,8 +2745,7 @@ eti_event (GnomeCanvasItem *item, - gnome_canvas_item_w2i (item, &event_x_item, &event_y_item); - - if (eti->maybe_in_drag) { -- if (abs (event_x_item - eti->drag_x) >= 3 || -- abs (event_y_item - eti->drag_y) >= 3) { -+ if (gtk_drag_check_threshold (GTK_WIDGET (item->canvas), eti->drag_x, eti->drag_y, event_x_item, event_y_item)) { - gboolean drag_handled; - - eti->maybe_in_drag = 0; diff --git a/mail/evolution/patches/patch-e-util_evolution-source-viewer_c b/mail/evolution/patches/patch-e-util_evolution-source-viewer_c deleted file mode 100644 index 771fdd1e068..00000000000 --- a/mail/evolution/patches/patch-e-util_evolution-source-viewer_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-e-util_evolution-source-viewer_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - ---- e-util/evolution-source-viewer.c.orig Fri Feb 28 20:38:10 2014 -+++ e-util/evolution-source-viewer.c Tue Apr 8 16:39:37 2014 -@@ -748,6 +748,7 @@ source_viewer_constructed (GObject *object) - gtk_widget_set_margin_bottom (widget, 3); - /* leave left margin at zero */ - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); -+ gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE); - gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); - viewer->top_panel = widget; /* do not reference */ - gtk_widget_show (widget); diff --git a/mail/evolution/patches/patch-e-util_test-source-selector_c b/mail/evolution/patches/patch-e-util_test-source-selector_c deleted file mode 100644 index 024fbdad445..00000000000 --- a/mail/evolution/patches/patch-e-util_test-source-selector_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-e-util_test-source-selector_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - ---- e-util/test-source-selector.c.orig Tue Jan 7 22:05:51 2014 -+++ e-util/test-source-selector.c Tue Apr 8 16:39:37 2014 -@@ -336,6 +336,7 @@ on_idle_create_widget (ESourceRegistry *registry) - G_CALLBACK (gtk_main_quit), NULL); - - notebook = gtk_notebook_new (); -+ gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE); - gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (notebook)); - - gtk_notebook_append_page ( diff --git a/mail/evolution/patches/patch-mail_e-mail-backend_c b/mail/evolution/patches/patch-mail_e-mail-backend_c deleted file mode 100644 index e4a632caf28..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-backend_c +++ /dev/null @@ -1,82 +0,0 @@ -$OpenBSD: patch-mail_e-mail-backend_c,v 1.3 2014/04/08 15:23:15 ajacoutot Exp $ - -From d569f7d87e9bfa2b287004e4fc31cc69e434117c Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 3 Apr 2014 12:54:54 +0200 -Subject: Cancel pending mail operations when going offline or on quit - ---- mail/e-mail-backend.c.orig Mon Mar 3 01:37:23 2014 -+++ mail/e-mail-backend.c Tue Apr 8 16:40:32 2014 -@@ -199,12 +199,15 @@ mail_backend_prepare_for_offline_cb (EShell *shell, - session = e_mail_backend_get_session (backend); - account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION (session)); - -- if (!e_shell_get_network_available (shell)) -+ if (!e_shell_get_network_available (shell)) { - camel_session_set_online (CAMEL_SESSION (session), FALSE); -+ camel_operation_cancel_all (); -+ } - - if (e_shell_backend_is_started (shell_backend)) { - gboolean ask_to_synchronize; - gboolean synchronize = FALSE; -+ GCancellable *cancellable; - - ask_to_synchronize = - e_shell_get_network_available (shell) && -@@ -220,12 +223,16 @@ mail_backend_prepare_for_offline_cb (EShell *shell, - camel_session_set_online (CAMEL_SESSION (session), FALSE); - } - -- if (!e_activity_get_cancellable (activity)) { -- GCancellable *cancellable; -- -+ cancellable = e_activity_get_cancellable (activity); -+ if (!cancellable) { - cancellable = camel_operation_new (); - e_activity_set_cancellable (activity, cancellable); - g_object_unref (cancellable); -+ } else { -+ /* Maybe the cancellable just got cancelled when the above -+ camel_operation_cancel_all() had been called, but we want -+ it alive for the following "go-offline" operation, thus reset it. */ -+ g_cancellable_reset (cancellable); - } - - e_shell_backend_add_activity (shell_backend, activity); -@@ -368,6 +375,7 @@ mail_backend_prepare_for_quit_cb (EShell *shell, - EMailSession *session; - ESourceRegistry *registry; - GList *list, *link; -+ GCancellable *cancellable; - gboolean delete_junk; - gboolean empty_trash; - -@@ -379,8 +387,17 @@ mail_backend_prepare_for_quit_cb (EShell *shell, - - camel_application_is_exiting = TRUE; - -+ camel_operation_cancel_all (); - mail_vfolder_shutdown (); - -+ cancellable = e_activity_get_cancellable (activity); -+ if (cancellable) { -+ /* Maybe the cancellable just got cancelled when the above -+ camel_operation_cancel_all() had been called, but we want -+ it alive for the following operations, thus reset it. */ -+ g_cancellable_reset (cancellable); -+ } -+ - list = camel_session_list_services (CAMEL_SESSION (session)); - - if (delete_junk) { -@@ -417,9 +434,6 @@ mail_backend_prepare_for_quit_cb (EShell *shell, - /* local trash requires special handling, - * due to POP3's "delete-expunged" option */ - CamelFolder *local_trash; -- GCancellable *cancellable; -- -- cancellable = e_activity_get_cancellable (activity); - - /* This should be lightning-fast since - * it's just the local trash folder. */ diff --git a/mail/evolution/patches/patch-mail_e-mail-config-assistant_c b/mail/evolution/patches/patch-mail_e-mail-config-assistant_c deleted file mode 100644 index 6d2fd1fa0ed..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-config-assistant_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-mail_e-mail-config-assistant_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- mail/e-mail-config-assistant.c.orig Fri Mar 7 19:15:31 2014 -+++ mail/e-mail-config-assistant.c Fri Apr 11 11:13:32 2014 -@@ -728,7 +728,7 @@ mail_config_assistant_constructed (GObject *object) - e_mail_config_assistant_add_page (assistant, page); - assistant->priv->receiving_page = g_object_ref (page); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - mail_identity_extension, "address", - page, "email-address", - G_BINDING_SYNC_CREATE); -@@ -811,7 +811,7 @@ mail_config_assistant_constructed (GObject *object) - e_mail_config_assistant_add_page (assistant, page); - assistant->priv->sending_page = g_object_ref (page); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - mail_identity_extension, "address", - page, "email-address", - G_BINDING_SYNC_CREATE); diff --git a/mail/evolution/patches/patch-mail_e-mail-config-defaults-page_c b/mail/evolution/patches/patch-mail_e-mail-config-defaults-page_c deleted file mode 100644 index 6779a185ec9..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-config-defaults-page_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-mail_e-mail-config-defaults-page_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- mail/e-mail-config-defaults-page.c.orig Fri Feb 28 20:38:10 2014 -+++ mail/e-mail-config-defaults-page.c Fri Apr 11 11:13:32 2014 -@@ -573,7 +573,7 @@ mail_config_defaults_page_constructed (GObject *object - page->priv->drafts_button = widget; /* not referenced */ - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - composition_ext, "drafts-folder", - widget, "folder-uri", - G_BINDING_BIDIRECTIONAL | -@@ -602,7 +602,7 @@ mail_config_defaults_page_constructed (GObject *object - gtk_widget_set_sensitive (widget, FALSE); - } - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - submission_ext, "sent-folder", - widget, "folder-uri", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-mail_e-mail-config-identity-page_c b/mail/evolution/patches/patch-mail_e-mail-config-identity-page_c deleted file mode 100644 index 6fd980ffb0e..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-config-identity-page_c +++ /dev/null @@ -1,54 +0,0 @@ -$OpenBSD: patch-mail_e-mail-config-identity-page_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- mail/e-mail-config-identity-page.c.orig Fri Feb 28 20:38:10 2014 -+++ mail/e-mail-config-identity-page.c Fri Apr 11 11:13:32 2014 -@@ -323,7 +323,7 @@ mail_config_identity_page_constructed (GObject *object - gtk_grid_attach (GTK_GRID (container), widget, 1, 2, 1, 1); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - source, "display-name", - widget, "text", - G_BINDING_BIDIRECTIONAL | -@@ -369,7 +369,7 @@ mail_config_identity_page_constructed (GObject *object - gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 1, 1); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "name", - widget, "text", - G_BINDING_BIDIRECTIONAL | -@@ -401,7 +401,7 @@ mail_config_identity_page_constructed (GObject *object - gtk_grid_attach (GTK_GRID (container), widget, 1, 2, 1, 1); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "address", - widget, "text", - G_BINDING_BIDIRECTIONAL | -@@ -452,7 +452,7 @@ mail_config_identity_page_constructed (GObject *object - gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 2, 1); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "reply-to", - widget, "text", - G_BINDING_BIDIRECTIONAL | -@@ -479,7 +479,7 @@ mail_config_identity_page_constructed (GObject *object - gtk_grid_attach (GTK_GRID (container), widget, 1, 2, 2, 1); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "organization", - widget, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-mail_e-mail-config-provider-page_c b/mail/evolution/patches/patch-mail_e-mail-config-provider-page_c deleted file mode 100644 index c7993763a54..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-config-provider-page_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-mail_e-mail-config-provider-page_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- mail/e-mail-config-provider-page.c.orig Fri Feb 28 20:38:10 2014 -+++ mail/e-mail-config-provider-page.c Fri Apr 11 11:13:32 2014 -@@ -343,7 +343,7 @@ mail_config_provider_page_add_entry (EMailConfigProvid - gtk_box_pack_start (GTK_BOX (hbox), input, TRUE, TRUE, 0); - gtk_widget_show (input); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - settings, entry->name, - input, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-mail_e-mail-config-security-page_c b/mail/evolution/patches/patch-mail_e-mail-config-security-page_c deleted file mode 100644 index d369256d66e..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-config-security-page_c +++ /dev/null @@ -1,36 +0,0 @@ -$OpenBSD: patch-mail_e-mail-config-security-page_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- mail/e-mail-config-security-page.c.orig Fri Feb 28 20:38:10 2014 -+++ mail/e-mail-config-security-page.c Fri Apr 11 11:13:32 2014 -@@ -313,7 +313,7 @@ mail_config_security_page_constructed (GObject *object - gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 1, 1); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - openpgp_ext, "key-id", - widget, "text", - G_BINDING_SYNC_CREATE | -@@ -433,7 +433,7 @@ mail_config_security_page_constructed (GObject *object - gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 1, 1); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - smime_ext, "signing-certificate", - widget, "text", - G_BINDING_BIDIRECTIONAL | -@@ -539,7 +539,7 @@ mail_config_security_page_constructed (GObject *object - gtk_grid_attach (GTK_GRID (container), widget, 1, 4, 1, 1); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - smime_ext, "encryption-certificate", - widget, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-mail_e-mail-config-service-notebook_c b/mail/evolution/patches/patch-mail_e-mail-config-service-notebook_c deleted file mode 100644 index 541aeb2b5e2..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-config-service-notebook_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-mail_e-mail-config-service-notebook_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - ---- mail/e-mail-config-service-notebook.c.orig Tue Jan 7 22:05:51 2014 -+++ mail/e-mail-config-service-notebook.c Tue Apr 8 16:39:37 2014 -@@ -206,6 +206,7 @@ mail_config_service_notebook_constructed (GObject *obj - constructed (object); - - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (object), FALSE); -+ gtk_notebook_set_show_border (GTK_NOTEBOOK (object), FALSE); - - /* Current page is still -1 so skip G_BINDING_SYNC_CREATE. */ - g_object_bind_property_full ( diff --git a/mail/evolution/patches/patch-mail_e-mail-config-welcome-page_c b/mail/evolution/patches/patch-mail_e-mail-config-welcome-page_c deleted file mode 100644 index 9f6547b9edb..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-config-welcome-page_c +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-mail_e-mail-config-welcome-page_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- mail/e-mail-config-welcome-page.c.orig Fri Feb 28 20:38:10 2014 -+++ mail/e-mail-config-welcome-page.c Fri Apr 11 11:13:32 2014 -@@ -20,6 +20,7 @@ - #include - #include - -+#include - #include - - #define E_MAIL_CONFIG_WELCOME_PAGE_GET_PRIVATE(obj) \ -@@ -123,7 +124,7 @@ mail_config_welcome_page_constructed (GObject *object) - gtk_box_pack_start (GTK_BOX (page), widget, FALSE, FALSE, 0); - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - page, "text", - widget, "label", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-mail_e-mail-config-window_c b/mail/evolution/patches/patch-mail_e-mail-config-window_c deleted file mode 100644 index 6ccf7e3cb6e..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-config-window_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-mail_e-mail-config-window_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - ---- mail/e-mail-config-window.c.orig Fri Feb 28 20:38:10 2014 -+++ mail/e-mail-config-window.c Tue Apr 8 16:39:37 2014 -@@ -365,6 +365,7 @@ mail_config_window_constructed (GObject *object) - gtk_widget_set_vexpand (widget, TRUE); - gtk_widget_set_margin_bottom (widget, 17); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); -+ gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE); - gtk_grid_attach (GTK_GRID (container), widget, 2, 1, 1, 1); - window->priv->notebook = widget; /* not referenced */ - gtk_widget_show (widget); diff --git a/mail/evolution/patches/patch-mail_e-mail-display_c b/mail/evolution/patches/patch-mail_e-mail-display_c deleted file mode 100644 index 8c433eef6bc..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-display_c +++ /dev/null @@ -1,86 +0,0 @@ -$OpenBSD: patch-mail_e-mail-display_c,v 1.3 2014/04/08 15:23:15 ajacoutot Exp $ - -From ab955f205453f98b9276a7c267dfb452114faa9d Mon Sep 17 00:00:00 2001 -From: Tomas Popela -Date: Fri, 4 Apr 2014 10:37:25 +0200 -Subject: EMailDisplay: Install HTML click event handlers on images in all - ---- mail/e-mail-display.c.orig Sun Mar 16 14:29:41 2014 -+++ mail/e-mail-display.c Tue Apr 8 16:40:58 2014 -@@ -887,26 +887,14 @@ initialize_web_view_colors (EMailDisplay *display) - } - - static void --setup_dom_bindings (GObject *object, -- GParamSpec *pspec, -- gpointer user_data) -+setup_image_click_event_listeners_on_document (WebKitDOMDocument *document, -+ WebKitWebView *web_view) - { -- WebKitWebView *web_view; -- WebKitWebFrame *frame; -- WebKitLoadStatus load_status; -- WebKitDOMDocument *document; -+ gint length, ii = 0; - WebKitDOMElement *button; - WebKitDOMNodeList *list; -- gint length, ii = 0; - -- frame = WEBKIT_WEB_FRAME (object); -- load_status = webkit_web_frame_get_load_status (frame); -- if (load_status != WEBKIT_LOAD_FINISHED) -- return; -- -- web_view = webkit_web_frame_get_web_view (frame); -- document = webkit_web_view_get_dom_document (web_view); -- -+ /* Install event listeners on document */ - button = webkit_dom_document_get_element_by_id ( - document, "__evo-collapse-headers-img"); - if (button != NULL) -@@ -930,6 +918,18 @@ setup_dom_bindings (GObject *object, - } - - static void -+setup_dom_bindings (WebKitWebView *web_view, -+ WebKitWebFrame *frame, -+ gpointer user_data) -+{ -+ WebKitDOMDocument *document; -+ -+ document = webkit_web_frame_get_dom_document (frame); -+ -+ setup_image_click_event_listeners_on_document (document, web_view); -+} -+ -+static void - mail_parts_bind_dom (GObject *object, - GParamSpec *pspec, - gpointer user_data) -@@ -1526,6 +1526,12 @@ e_mail_display_init (EMailDisplay *display) - g_signal_connect ( - display, "notify::uri", - G_CALLBACK (mail_display_uri_changed), NULL); -+ g_signal_connect ( -+ display, "document-load-finished", -+ G_CALLBACK (setup_dom_bindings), NULL); -+ g_signal_connect ( -+ display, "document-load-finished", -+ G_CALLBACK (initialize_web_view_colors), NULL); - - display->priv->settings = g_settings_new ("org.gnome.evolution.mail"); - g_signal_connect_swapped ( -@@ -1543,13 +1549,7 @@ e_mail_display_init (EMailDisplay *display) - main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (display)); - g_signal_connect ( - main_frame, "notify::load-status", -- G_CALLBACK (setup_dom_bindings), NULL); -- g_signal_connect ( -- main_frame, "notify::load-status", - G_CALLBACK (mail_parts_bind_dom), NULL); -- g_signal_connect ( -- display, "document-load-finished", -- G_CALLBACK (initialize_web_view_colors), NULL); - - actions = e_web_view_get_action_group (E_WEB_VIEW (display), "mailto"); - gtk_action_group_add_actions ( diff --git a/mail/evolution/patches/patch-mail_e-mail-reader_c b/mail/evolution/patches/patch-mail_e-mail-reader_c deleted file mode 100644 index fea42fc9b01..00000000000 --- a/mail/evolution/patches/patch-mail_e-mail-reader_c +++ /dev/null @@ -1,50 +0,0 @@ -$OpenBSD: patch-mail_e-mail-reader_c,v 1.4 2014/04/11 10:00:17 ajacoutot Exp $ - -From afe39b84353ed091828fe704cf127a21f492b415 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Wed, 26 Mar 2014 16:48:03 +0100 -Subject: Fix two memory leaks - -From 8e21593713764056bb75460042a2178e803039b7 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 10 Apr 2014 18:03:06 +0200 -Subject: Reset MessageList::seen_id in mail_reader_message_seen_cb() - ---- mail/e-mail-reader.c.orig Fri Mar 7 19:15:31 2014 -+++ mail/e-mail-reader.c Fri Apr 11 11:10:34 2014 -@@ -868,20 +868,16 @@ action_mail_move_cb (GtkAction *action, - g_free (default_xfer_messages_uri); - default_xfer_messages_uri = g_strdup (uri); - -- if (uri != NULL) { -+ if (uri != NULL) - mail_transfer_messages ( - session, folder, uids, - TRUE, uri, 0, NULL, NULL); -- uids = NULL; -- } - - exit: -- if (uids != NULL) -- g_ptr_array_unref (uids); -- - gtk_widget_destroy (dialog); - - g_clear_object (&folder); -+ g_ptr_array_unref (uids); - } - - static void -@@ -2593,6 +2589,12 @@ mail_reader_message_seen_cb (gpointer user_data) - display = e_mail_reader_get_mail_display (reader); - parts = e_mail_display_get_part_list (display); - message_list = e_mail_reader_get_message_list (reader); -+ -+ g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); -+ -+ /* zero the timeout id now, if it was not rescheduled */ -+ if (g_source_get_id (g_main_current_source ()) == MESSAGE_LIST (message_list)->seen_id) -+ MESSAGE_LIST (message_list)->seen_id = 0; - - if (e_tree_is_dragging (E_TREE (message_list))) - return FALSE; diff --git a/mail/evolution/patches/patch-mail_em-folder-tree_c b/mail/evolution/patches/patch-mail_em-folder-tree_c deleted file mode 100644 index c10dab12703..00000000000 --- a/mail/evolution/patches/patch-mail_em-folder-tree_c +++ /dev/null @@ -1,55 +0,0 @@ -$OpenBSD: patch-mail_em-folder-tree_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 90914caf73d7068b211690a6820e7144d3fc3a47 Mon Sep 17 00:00:00 2001 -From: Matthew Barnes -Date: Sun, 23 Mar 2014 12:31:24 -0400 -Subject: folder_tree_render_icon: Readability cleanup. - -From 162f568fde4c87b4105abb3897dc633791c794b7 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 4 Apr 2014 15:37:13 +0200 -Subject: Fix few more memory leaks - ---- mail/em-folder-tree.c.orig Tue Apr 8 16:41:56 2014 -+++ mail/em-folder-tree.c Tue Apr 8 16:41:48 2014 -@@ -845,6 +845,7 @@ folder_tree_render_icon (GtkTreeViewColumn *column, - gboolean is_selected; - gboolean is_drafts = FALSE; - gboolean is_drag_dest = FALSE; -+ gboolean show_new_mail_emblem; - guint32 fi_flags = 0; - - gtk_tree_model_get ( -@@ -888,8 +889,13 @@ folder_tree_render_icon (GtkTreeViewColumn *column, - - icon = g_themed_icon_new (icon_name); - -+ show_new_mail_emblem = -+ (unread > old_unread) && -+ !is_selected && !is_drafts && -+ ((fi_flags & CAMEL_FOLDER_VIRTUAL) == 0); -+ - /* Show an emblem if there's new mail. */ -- if (!is_selected && unread > old_unread && !is_drafts && !(fi_flags & CAMEL_FOLDER_VIRTUAL)) { -+ if (show_new_mail_emblem) { - GIcon *temp_icon; - GEmblem *emblem; - -@@ -3199,6 +3205,8 @@ em_folder_tree_select_next_path (EMFolderTree *folder_ - /* TODO : Flags here for better options */ - } while (skip_read_folders && unread <=0 && - gtk_tree_path_compare (current_path, path)); -+ -+ gtk_tree_path_free (current_path); - } - - if (path) { -@@ -3212,6 +3220,8 @@ em_folder_tree_select_next_path (EMFolderTree *folder_ - priv->cursor_set = TRUE; - } - gtk_tree_view_scroll_to_cell (tree_view, path, NULL, TRUE, 0.5f, 0.0f); -+ -+ gtk_tree_path_free (path); - } - - return; diff --git a/mail/evolution/patches/patch-modules_addressbook_autocompletion-config_c b/mail/evolution/patches/patch-modules_addressbook_autocompletion-config_c deleted file mode 100644 index 39b0782db0f..00000000000 --- a/mail/evolution/patches/patch-modules_addressbook_autocompletion-config_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-modules_addressbook_autocompletion-config_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 9f656a1259a71c61068febf61733b2787e6ed105 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 17:08:58 +0100 -Subject: Bug #726542 - Unpadded black border on various mail account settings - ---- modules/addressbook/autocompletion-config.c.orig Tue Jan 7 22:05:51 2014 -+++ modules/addressbook/autocompletion-config.c Tue Apr 8 16:39:37 2014 -@@ -77,6 +77,7 @@ get_main_notebook (EConfig *config, - return old; - - notebook = gtk_notebook_new (); -+ gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE); - gtk_widget_show (notebook); - - return notebook; diff --git a/mail/evolution/patches/patch-modules_book-config-ldap_evolution-book-config-ldap_c b/mail/evolution/patches/patch-modules_book-config-ldap_evolution-book-config-ldap_c deleted file mode 100644 index 3e1b49fa4db..00000000000 --- a/mail/evolution/patches/patch-modules_book-config-ldap_evolution-book-config-ldap_c +++ /dev/null @@ -1,45 +0,0 @@ -$OpenBSD: patch-modules_book-config-ldap_evolution-book-config-ldap_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- modules/book-config-ldap/evolution-book-config-ldap.c.orig Sun Feb 16 15:11:01 2014 -+++ modules/book-config-ldap/evolution-book-config-ldap.c Fri Apr 11 11:13:32 2014 -@@ -849,7 +849,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend - is_new_source = !e_source_has_extension (scratch_source, extension_name); - extension = e_source_get_extension (scratch_source, extension_name); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "host", - context->host_entry, "text", - G_BINDING_BIDIRECTIONAL | -@@ -870,7 +870,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend - context->port_combo, "changed", - G_CALLBACK (book_config_ldap_port_combo_changed), NULL); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "user", - context->auth_entry, "text", - G_BINDING_BIDIRECTIONAL | -@@ -899,7 +899,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend - - widget = gtk_bin_get_child (GTK_BIN (context->search_base_combo)); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "root-dn", - widget, "text", - G_BINDING_BIDIRECTIONAL | -@@ -911,7 +911,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend - G_BINDING_BIDIRECTIONAL | - G_BINDING_SYNC_CREATE); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "filter", - context->search_filter_entry, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-modules_cal-config-caldav_evolution-cal-config-caldav_c b/mail/evolution/patches/patch-modules_cal-config-caldav_evolution-cal-config-caldav_c deleted file mode 100644 index cbec3b4b3d9..00000000000 --- a/mail/evolution/patches/patch-modules_cal-config-caldav_evolution-cal-config-caldav_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-modules_cal-config-caldav_evolution-cal-config-caldav_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- modules/cal-config-caldav/evolution-cal-config-caldav.c.orig Tue Jan 7 22:05:51 2014 -+++ modules/cal-config-caldav/evolution-cal-config-caldav.c Fri Apr 11 11:13:32 2014 -@@ -261,7 +261,7 @@ cal_config_caldav_insert_widgets (ESourceConfigBackend - G_BINDING_BIDIRECTIONAL | - G_BINDING_SYNC_CREATE); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - extension, "email-address", - context->email_entry, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-modules_mail-config_e-mail-config-remote-accounts_c b/mail/evolution/patches/patch-modules_mail-config_e-mail-config-remote-accounts_c deleted file mode 100644 index 2632704e81c..00000000000 --- a/mail/evolution/patches/patch-modules_mail-config_e-mail-config-remote-accounts_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-modules_mail-config_e-mail-config-remote-accounts_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- modules/mail-config/e-mail-config-remote-accounts.c.orig Tue Jan 7 22:05:51 2014 -+++ modules/mail-config/e-mail-config-remote-accounts.c Fri Apr 11 11:13:32 2014 -@@ -258,7 +258,7 @@ mail_config_remote_backend_insert_widgets (EMailConfig - remote_backend->auth_check = widget; /* do not reference */ - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - settings, "host", - remote_backend->host_entry, "text", - G_BINDING_BIDIRECTIONAL | -@@ -284,7 +284,7 @@ mail_config_remote_backend_insert_widgets (EMailConfig - remote_backend->port_entry, "security-method", - G_BINDING_SYNC_CREATE); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - settings, "user", - remote_backend->user_entry, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-modules_mail-config_e-mail-config-sendmail-backend_c b/mail/evolution/patches/patch-modules_mail-config_e-mail-config-sendmail-backend_c deleted file mode 100644 index 68c5a1ff26f..00000000000 --- a/mail/evolution/patches/patch-modules_mail-config_e-mail-config-sendmail-backend_c +++ /dev/null @@ -1,35 +0,0 @@ -$OpenBSD: patch-modules_mail-config_e-mail-config-sendmail-backend_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- modules/mail-config/e-mail-config-sendmail-backend.c.orig Tue Jan 7 22:05:51 2014 -+++ modules/mail-config/e-mail-config-sendmail-backend.c Fri Apr 11 11:13:32 2014 -@@ -22,6 +22,7 @@ - #include - - #include -+#include - #include - - #include "e-mail-config-sendmail-backend.h" -@@ -139,7 +140,7 @@ mail_config_sendmail_backend_insert_widgets (EMailConf - G_BINDING_BIDIRECTIONAL | - G_BINDING_SYNC_CREATE); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - settings, "custom-binary", - custom_binary_entry, "text", - G_BINDING_BIDIRECTIONAL | -@@ -156,7 +157,7 @@ mail_config_sendmail_backend_insert_widgets (EMailConf - G_BINDING_BIDIRECTIONAL | - G_BINDING_SYNC_CREATE); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - settings, "custom-args", - custom_args_entry, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-modules_mail-config_e-mail-config-smtp-backend_c b/mail/evolution/patches/patch-modules_mail-config_e-mail-config-smtp-backend_c deleted file mode 100644 index 5af33fb400e..00000000000 --- a/mail/evolution/patches/patch-modules_mail-config_e-mail-config-smtp-backend_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-modules_mail-config_e-mail-config-smtp-backend_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- modules/mail-config/e-mail-config-smtp-backend.c.orig Tue Jan 7 22:05:51 2014 -+++ modules/mail-config/e-mail-config-smtp-backend.c Fri Apr 11 11:13:32 2014 -@@ -240,7 +240,7 @@ mail_config_smtp_backend_insert_widgets (EMailConfigSe - port = camel_network_settings_get_port ( - CAMEL_NETWORK_SETTINGS (settings)); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - settings, "host", - priv->host_entry, "text", - G_BINDING_BIDIRECTIONAL | -@@ -266,7 +266,7 @@ mail_config_smtp_backend_insert_widgets (EMailConfigSe - priv->port_entry, "security-method", - G_BINDING_SYNC_CREATE); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - settings, "user", - priv->user_entry, "text", - G_BINDING_BIDIRECTIONAL | diff --git a/mail/evolution/patches/patch-modules_startup-wizard_e-mail-config-import-progress-page_c b/mail/evolution/patches/patch-modules_startup-wizard_e-mail-config-import-progress-page_c deleted file mode 100644 index 8564ba1ba5b..00000000000 --- a/mail/evolution/patches/patch-modules_startup-wizard_e-mail-config-import-progress-page_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-modules_startup-wizard_e-mail-config-import-progress-page_c,v 1.1 2014/04/11 10:00:17 ajacoutot Exp $ - -From eb61b07aad09903f9937b424d9f3e720559a1c16 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Apr 2014 10:55:25 +0200 -Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() - ---- modules/startup-wizard/e-mail-config-import-progress-page.c.orig Fri Feb 28 20:38:10 2014 -+++ modules/startup-wizard/e-mail-config-import-progress-page.c Fri Apr 11 11:13:32 2014 -@@ -199,7 +199,7 @@ mail_config_import_progress_page_constructed (GObject - page->priv->progress_bar = widget; /* not referenced */ - gtk_widget_show (widget); - -- g_object_bind_property ( -+ e_binding_bind_object_text_property ( - activity, "text", - widget, "text", - G_BINDING_SYNC_CREATE); diff --git a/mail/evolution/patches/patch-modules_text-highlight_e-mail-formatter-text-highlight_c b/mail/evolution/patches/patch-modules_text-highlight_e-mail-formatter-text-highlight_c deleted file mode 100644 index 8aaac1958f4..00000000000 --- a/mail/evolution/patches/patch-modules_text-highlight_e-mail-formatter-text-highlight_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-modules_text-highlight_e-mail-formatter-text-highlight_c,v 1.5 2014/04/08 15:23:15 ajacoutot Exp $ - -From 7c54be0edafd10f1e1d6d26c83a8cd4b011b2398 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Wed, 26 Mar 2014 10:38:34 +0100 -Subject: [text-highlight] Fix a possible memory leak - ---- modules/text-highlight/e-mail-formatter-text-highlight.c.orig Fri Feb 28 20:38:11 2014 -+++ modules/text-highlight/e-mail-formatter-text-highlight.c Tue Apr 8 16:36:32 2014 -@@ -105,6 +105,7 @@ get_syntax (EMailPart *part, - if (filename != NULL) { - gchar *ext = g_strrstr (filename, "."); - if (ext != NULL) { -+ g_free (syntax); - syntax = (gchar *) get_syntax_for_ext (ext + 1); - syntax = syntax ? g_strdup (syntax) : NULL; - } diff --git a/mail/evolution/patches/patch-plugins_bbdb_bbdb_c b/mail/evolution/patches/patch-plugins_bbdb_bbdb_c deleted file mode 100644 index cfbcc5a3d7c..00000000000 --- a/mail/evolution/patches/patch-plugins_bbdb_bbdb_c +++ /dev/null @@ -1,203 +0,0 @@ -$OpenBSD: patch-plugins_bbdb_bbdb_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From a132c1f9bd00195f63e99b2ebf08243a98b8346d Mon Sep 17 00:00:00 2001 -From: Watson Yuuma Sato -Date: Mon, 24 Mar 2014 17:22:16 +0100 -Subject: Bug #545106 - [Automatic Contacts] Adds duplicate email addresses - ---- plugins/bbdb/bbdb.c.orig Tue Jan 7 22:05:51 2014 -+++ plugins/bbdb/bbdb.c Tue Apr 8 16:35:48 2014 -@@ -220,7 +220,14 @@ handle_destination (EDestination *destination) - } else { - const gchar *name; - const gchar *email; -+ EContact *contact; - -+ contact = e_destination_get_contact (destination); -+ -+ /* Skipping autocompleted contacts */ -+ if (contact != NULL) -+ return; -+ - name = e_destination_get_name (destination); - email = e_destination_get_email (destination); - -@@ -278,6 +285,14 @@ bbdb_do_it (EBookClient *client, - gboolean status; - EContact *contact; - GError *error = NULL; -+ EShell *shell; -+ ESourceRegistry *registry; -+ EClientCache *client_cache; -+ GList *addressbooks; -+ GList *aux_addressbooks; -+ EBookClient *client_addressbook; -+ ESourceAutocomplete *autocomplete_extension; -+ gboolean on_autocomplete, has_autocomplete; - - g_return_if_fail (client != NULL); - -@@ -293,64 +308,109 @@ bbdb_do_it (EBookClient *client, - name = temp_name; - } - -- /* If any contacts exists with this email address, don't do anything */ -- query_string = g_strdup_printf ("(contains \"email\" \"%s\")", email); -- status = e_book_client_get_contacts_sync (client, query_string, &contacts, NULL, NULL); -- g_free (query_string); -- if (contacts != NULL || !status) { -- g_slist_free_full (contacts, (GDestroyNotify) g_object_unref); -- g_free (temp_name); -+ /* Search through all addressbooks */ -+ shell = e_shell_get_default (); -+ registry = e_shell_get_registry (shell); -+ client_cache = e_shell_get_client_cache (shell); -+ addressbooks = e_source_registry_list_enabled (registry, E_SOURCE_EXTENSION_ADDRESS_BOOK); - -- return; -- } -+ aux_addressbooks = addressbooks; -+ while (aux_addressbooks != NULL) { - -- if (g_utf8_strchr (name, -1, '\"')) { -- GString *tmp = g_string_new (name); -- gchar *p; -+ /* Check only addressbooks with autocompletion enabled */ -+ has_autocomplete = e_source_has_extension (aux_addressbooks->data, E_SOURCE_EXTENSION_AUTOCOMPLETE); -+ if (!has_autocomplete) { -+ aux_addressbooks = aux_addressbooks->next; -+ continue; -+ } - -- while (p = g_utf8_strchr (tmp->str, tmp->len, '\"'), p) -- tmp = g_string_erase (tmp, p - tmp->str, 1); -+ autocomplete_extension = e_source_get_extension (aux_addressbooks->data, E_SOURCE_EXTENSION_AUTOCOMPLETE); -+ on_autocomplete = e_source_autocomplete_get_include_me (autocomplete_extension); -+ if (!on_autocomplete) { -+ aux_addressbooks = aux_addressbooks->next; -+ continue; -+ } - -- g_free (temp_name); -- temp_name = g_string_free (tmp, FALSE); -- name = temp_name; -- } -+ client_addressbook = (EBookClient *) e_client_cache_get_client_sync ( -+ client_cache, (ESource *) aux_addressbooks->data, -+ E_SOURCE_EXTENSION_ADDRESS_BOOK, -+ NULL, &error); - -- contacts = NULL; -- /* If a contact exists with this name, add the email address to it. */ -- query_string = g_strdup_printf ("(is \"full_name\" \"%s\")", name); -- status = e_book_client_get_contacts_sync (client, query_string, &contacts, NULL, NULL); -- g_free (query_string); -- if (contacts != NULL || !status) { -- /* FIXME: If there's more than one contact with this -- * name, just give up; we're not smart enough for -- * this. */ -- if (!status || contacts->next != NULL) { -- g_slist_free_full ( -- contacts, -- (GDestroyNotify) g_object_unref); -+ if (error != NULL) { -+ g_warning ("bbdb: Failed to get addressbook client : %s\n", error->message); -+ g_error_free (error); -+ aux_addressbooks = aux_addressbooks->next; -+ continue; -+ } -+ -+ /* If any contacts exists with this email address, don't do anything */ -+ query_string = g_strdup_printf ("(contains \"email\" \"%s\")", email); -+ status = e_book_client_get_contacts_sync (client_addressbook, query_string, &contacts, NULL, NULL); -+ g_free (query_string); -+ if (contacts != NULL || !status) { -+ g_slist_free_full (contacts, (GDestroyNotify) g_object_unref); - g_free (temp_name); -+ g_list_free_full (addressbooks, (GDestroyNotify) g_object_unref); -+ g_object_unref (client_addressbook); -+ - return; - } - -- contact = (EContact *) contacts->data; -- add_email_to_contact (contact, email); -+ if (g_utf8_strchr (name, -1, '\"')) { -+ GString *tmp = g_string_new (name); -+ gchar *p; - -- e_book_client_modify_contact_sync ( -- client, contact, NULL, &error); -+ while (p = g_utf8_strchr (tmp->str, tmp->len, '\"'), p) -+ tmp = g_string_erase (tmp, p - tmp->str, 1); - -- if (error != NULL) { -- g_warning ( -- "bbdb: Could not modify contact: %s\n", -- error->message); -- g_error_free (error); -+ g_free (temp_name); -+ temp_name = g_string_free (tmp, FALSE); -+ name = temp_name; - } - -- g_slist_free_full (contacts, (GDestroyNotify) g_object_unref); -- g_free (temp_name); -- return; -+ contacts = NULL; -+ /* If a contact exists with this name, add the email address to it. */ -+ query_string = g_strdup_printf ("(is \"full_name\" \"%s\")", name); -+ status = e_book_client_get_contacts_sync (client_addressbook, query_string, &contacts, NULL, NULL); -+ g_free (query_string); -+ if (contacts != NULL || !status) { -+ /* FIXME: If there's more than one contact with this -+ * name, just give up; we're not smart enough for -+ * this. */ -+ if (!status || contacts->next != NULL) { -+ g_slist_free_full ( -+ contacts, -+ (GDestroyNotify) g_object_unref); -+ g_free (temp_name); -+ g_list_free_full (addressbooks, (GDestroyNotify) g_object_unref); -+ g_object_unref (client_addressbook); -+ return; -+ } -+ -+ contact = (EContact *) contacts->data; -+ add_email_to_contact (contact, email); -+ -+ e_book_client_modify_contact_sync ( -+ client_addressbook, contact, NULL, &error); -+ -+ if (error != NULL) { -+ g_warning ("bbdb: Could not modify contact: %s\n", error->message); -+ g_error_free (error); -+ } -+ -+ g_slist_free_full (contacts, (GDestroyNotify) g_object_unref); -+ g_free (temp_name); -+ g_list_free_full (addressbooks, (GDestroyNotify) g_object_unref); -+ g_object_unref (client_addressbook); -+ return; -+ } -+ -+ g_object_unref(client_addressbook); -+ aux_addressbooks = aux_addressbooks->next; - } - -+ g_list_free_full (addressbooks, (GDestroyNotify) g_object_unref); -+ - /* Otherwise, create a new contact. */ - contact = e_contact_new (); - e_contact_set (contact, E_CONTACT_FULL_NAME, (gpointer) name); -@@ -360,9 +420,7 @@ bbdb_do_it (EBookClient *client, - e_book_client_add_contact_sync (client, contact, NULL, NULL, &error); - - if (error != NULL) { -- g_warning ( -- "bbdb: Failed to add new contact: %s", -- error->message); -+ g_warning ("bbdb: Failed to add new contact: %s", error->message); - g_error_free (error); - } - diff --git a/mail/evolution/patches/patch-shell_e-shell-searchbar_c b/mail/evolution/patches/patch-shell_e-shell-searchbar_c deleted file mode 100644 index d28c5573d56..00000000000 --- a/mail/evolution/patches/patch-shell_e-shell-searchbar_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-shell_e-shell-searchbar_c,v 1.1 2014/04/08 15:23:15 ajacoutot Exp $ - -From 07a34a63347ce3a28c3dab5bb27b520d07374f09 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 27 Mar 2014 12:19:21 +0100 -Subject: Bug #726654 - Search bar's filter change may not steal keyboard focus - ---- shell/e-shell-searchbar.c.orig Fri Mar 7 19:15:31 2014 -+++ shell/e-shell-searchbar.c Tue Apr 8 16:38:31 2014 -@@ -332,17 +332,10 @@ shell_searchbar_filter_changed_cb (GtkComboBox *filter - EShellSearchbar *searchbar) - { - EShellView *shell_view; -- EShellContent *shell_content; - - shell_view = e_shell_searchbar_get_shell_view (searchbar); - - e_shell_view_execute_search (shell_view); -- -- /* Direct the focus away from the filter combo box so the -- * next keyboard event doesn't change the selected filter. -- * The user is probably trying to navigate search results. */ -- shell_content = e_shell_view_get_shell_content (shell_view); -- e_shell_content_focus_search_results (shell_content); - } - - static void