Revbump to fix #317841 and #317765

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 349 insertions, 0 deletions

diff --git a/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_1.patch b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_1.patch
new file mode 100644
index 000000000000..d6eb4581b0a6
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_1.patch
@@ -0,0 +1,170 @@
+From 63fb1857b99f53fbd2506799049b645fce1c1f0c Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <i.am@jimramsay.com>
+Date: Tue, 18 May 2010 16:39:47 -0400
+Subject: [PATCH 12/14] Bug 594153 (1/3) - Allow setting alarms on any meeting
+
+This introduces a new action_group called "editable" in the comp-editor
+that can be used by other components to assign actions that should be
+sensitized separately from the existing "individual" group, such as the
+"Alarms" and "Show Time as Busy" event actions.
+
+This fixes a bug introduced in 0597b877c5bf4d21ac4048742ddf6b11e24877ba
+where these two actions were accidentally grouped with other actions that
+should legitimately be in the "individual" group.
+---
+ calendar/gui/dialogs/comp-editor.c  |   15 +++++++++++----
+ calendar/gui/dialogs/event-editor.c |   32 +++++++++++++++++++++++---------
+ calendar/gui/dialogs/event-page.c   |    3 +++
+ calendar/gui/dialogs/memo-page.c    |    3 +++
+ calendar/gui/dialogs/task-page.c    |    3 +++
+ 5 files changed, 43 insertions(+), 13 deletions(-)
+
+diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
+index 6fc01ca..46e340f 100644
+--- a/calendar/gui/dialogs/comp-editor.c
++++ b/calendar/gui/dialogs/comp-editor.c
+@@ -1091,7 +1091,7 @@ static GtkActionEntry individual_entries[] = {
+ 	  G_CALLBACK (action_attach_cb) }
+ };
+ 
+-static GtkToggleActionEntry individual_toggle_entries[] = {
++static GtkToggleActionEntry personal_toggle_entries[] = {
+ 
+ 	{ "view-categories",
+ 	  NULL,
+@@ -1603,9 +1603,6 @@ comp_editor_init (CompEditor *editor)
+ 	gtk_action_group_add_actions (
+ 		action_group, individual_entries,
+ 		G_N_ELEMENTS (individual_entries), editor);
+-	gtk_action_group_add_toggle_actions (
+-		action_group, individual_toggle_entries,
+-		G_N_ELEMENTS (individual_toggle_entries), editor);
+ 	gtk_action_group_add_radio_actions (
+ 		action_group, classification_radio_entries,
+ 		G_N_ELEMENTS (classification_radio_entries),
+@@ -1615,6 +1612,16 @@ comp_editor_init (CompEditor *editor)
+ 		priv->ui_manager, action_group, 0);
+ 	g_object_unref (action_group);
+ 
++	action_group = gtk_action_group_new ("editable");
++	gtk_action_group_set_translation_domain (
++		action_group, GETTEXT_PACKAGE);
++	gtk_action_group_add_toggle_actions (
++		action_group, personal_toggle_entries,
++		G_N_ELEMENTS (personal_toggle_entries), editor);
++	gtk_ui_manager_insert_action_group (
++		priv->ui_manager, action_group, 0);
++	g_object_unref (action_group);
++
+ 	action_group = gtk_action_group_new ("coordinated");
+ 	gtk_action_group_set_translation_domain (
+ 		action_group, GETTEXT_PACKAGE);
+diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
+index 7251123..3b9a8d0 100644
+--- a/calendar/gui/dialogs/event-editor.c
++++ b/calendar/gui/dialogs/event-editor.c
+@@ -195,7 +195,7 @@ action_show_time_busy_cb (GtkToggleAction *action,
+ 	event_page_set_show_time_busy (editor->priv->event_page, active);
+ }
+ 
+-static GtkActionEntry event_entries[] = {
++static GtkActionEntry editable_entries[] = {
+ 
+ 	{ "alarms",
+ 	  "appointment-soon",
+@@ -203,6 +203,20 @@ static GtkActionEntry event_entries[] = {
+ 	  NULL,
+ 	  N_("Click here to set or unset alarms for this event"),
+ 	  G_CALLBACK (action_alarms_cb) },
++};
++
++static GtkToggleActionEntry editable_toggle_entries[] = {
++
++	{ "show-time-busy",
++	  GTK_STOCK_DIALOG_ERROR,
++	  N_("Show Time as _Busy"),
++	  NULL,
++	  N_("Toggles whether to show time as busy"),
++	  G_CALLBACK (action_show_time_busy_cb),
++	  FALSE }
++};
++
++static GtkActionEntry event_entries[] = {
+ 
+ 	{ "recurrence",
+ 	  "stock_task-recurring",
+@@ -228,14 +242,6 @@ static GtkToggleActionEntry event_toggle_entries[] = {
+ 	  N_("Toggles whether to have All Day Event"),
+ 	  G_CALLBACK (action_all_day_event_cb),
+ 	  FALSE },
+-
+-	{ "show-time-busy",
+-	  GTK_STOCK_DIALOG_ERROR,
+-	  N_("Show Time as _Busy"),
+-	  NULL,
+-	  N_("Toggles whether to show time as busy"),
+-	  G_CALLBACK (action_show_time_busy_cb),
+-	  FALSE }
+ };
+ 
+ static GtkActionEntry meeting_entries[] = {
+@@ -481,6 +487,14 @@ event_editor_init (EventEditor *ee)
+ 		action_group, event_toggle_entries,
+ 		G_N_ELEMENTS (event_toggle_entries), ee);
+ 
++	action_group = comp_editor_get_action_group (editor, "editable");
++	gtk_action_group_add_actions (
++		action_group, editable_entries,
++		G_N_ELEMENTS (editable_entries), ee);
++	gtk_action_group_add_toggle_actions (
++		action_group, editable_toggle_entries,
++		G_N_ELEMENTS (editable_toggle_entries), ee);
++
+ 	action_group = comp_editor_get_action_group (editor, "coordinated");
+ 	gtk_action_group_add_actions (
+ 		action_group, meeting_entries,
+diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
+index eb95245..fcc1ea9 100644
+--- a/calendar/gui/dialogs/event-page.c
++++ b/calendar/gui/dialogs/event-page.c
+@@ -806,6 +806,9 @@ sensitize_widgets (EventPage *epage)
+ 	gtk_widget_set_sensitive (priv->invite, (!read_only &&  sens) || delegate);
+ 	gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);
+ 
++	action_group = comp_editor_get_action_group (editor, "editable");
++	gtk_action_group_set_sensitive (action_group, !read_only);
++
+ 	action_group = comp_editor_get_action_group (editor, "individual");
+ 	gtk_action_group_set_sensitive (action_group, sensitize);
+ 
+diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
+index 83cd00a..511f483 100644
+--- a/calendar/gui/dialogs/memo-page.c
++++ b/calendar/gui/dialogs/memo-page.c
+@@ -373,6 +373,9 @@ sensitize_widgets (MemoPage *mpage)
+ 		}
+ 	}
+ 
++	action_group = comp_editor_get_action_group (editor, "editable");
++	gtk_action_group_set_sensitive (action_group, !read_only);
++
+ 	action_group = comp_editor_get_action_group (editor, "individual");
+ 	gtk_action_group_set_sensitive (action_group, sensitize);
+ }
+diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
+index 8b5c028..175e218 100644
+--- a/calendar/gui/dialogs/task-page.c
++++ b/calendar/gui/dialogs/task-page.c
+@@ -365,6 +365,9 @@ sensitize_widgets (TaskPage *tpage)
+ 	gtk_widget_set_sensitive (priv->invite, (!read_only &&  sens));
+ 	gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);
+ 
++	action_group = comp_editor_get_action_group (editor, "editable");
++	gtk_action_group_set_sensitive (action_group, !read_only);
++
+ 	action_group = comp_editor_get_action_group (editor, "individual");
+ 	gtk_action_group_set_sensitive (action_group, sensitize);
+ 
+-- 
+1.7.1
+
diff --git a/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_2.patch b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_2.patch
new file mode 100644
index 000000000000..cdda0dd3d6b4
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_2.patch
@@ -0,0 +1,54 @@
+From ff323fa4ae85fb293e0f419a5364823b90562216 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <i.am@jimramsay.com>
+Date: Tue, 18 May 2010 16:50:20 -0400
+Subject: [PATCH 13/14] Bug 594153 (2/3) - Allow setting alarms on any meeting
+
+The "view-time-zone" and "view-categories" actions should not have
+been grouped with the "individual" action group but rather the "core"
+action group, as they should always be available regardless of whether
+or not the element being edited is read-only/owned, as they simply
+affect visibility of various widgets.
+
+This fixes a bug introduced in 0597b877c5bf4d21ac4048742ddf6b11e24877ba
+where these two actions were accidentally grouped with other actions
+that should legitimately be in the "individual" group.
+---
+ calendar/gui/dialogs/comp-editor.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
+index 46e340f..7d27474 100644
+--- a/calendar/gui/dialogs/comp-editor.c
++++ b/calendar/gui/dialogs/comp-editor.c
+@@ -1091,7 +1091,7 @@ static GtkActionEntry individual_entries[] = {
+ 	  G_CALLBACK (action_attach_cb) }
+ };
+ 
+-static GtkToggleActionEntry personal_toggle_entries[] = {
++static GtkToggleActionEntry core_toggle_entries[] = {
+ 
+ 	{ "view-categories",
+ 	  NULL,
+@@ -1593,6 +1593,9 @@ comp_editor_init (CompEditor *editor)
+ 	gtk_action_group_add_actions (
+ 		action_group, core_entries,
+ 		G_N_ELEMENTS (core_entries), editor);
++	gtk_action_group_add_toggle_actions (
++		action_group, core_toggle_entries,
++		G_N_ELEMENTS (core_toggle_entries), editor);
+ 	gtk_ui_manager_insert_action_group (
+ 		priv->ui_manager, action_group, 0);
+ 	g_object_unref (action_group);
+@@ -1615,9 +1618,6 @@ comp_editor_init (CompEditor *editor)
+ 	action_group = gtk_action_group_new ("editable");
+ 	gtk_action_group_set_translation_domain (
+ 		action_group, GETTEXT_PACKAGE);
+-	gtk_action_group_add_toggle_actions (
+-		action_group, personal_toggle_entries,
+-		G_N_ELEMENTS (personal_toggle_entries), editor);
+ 	gtk_ui_manager_insert_action_group (
+ 		priv->ui_manager, action_group, 0);
+ 	g_object_unref (action_group);
+-- 
+1.7.1
+
diff --git a/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_3.patch b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_3.patch
new file mode 100644
index 000000000000..84ab8d0676e8
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.28.3.1-allow-setting-alarms_3.patch
@@ -0,0 +1,54 @@
+From 22e540a225da939e9de02912d638402d2353b129 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <i.am@jimramsay.com>
+Date: Wed, 28 Apr 2010 10:46:15 -0400
+Subject: [PATCH 14/14] Bug 594153 (3/3) - Allow setting alarms on any meeting
+
+By tying the attachment view "editable" action group to comp-editor
+"individual" group, these add/remove actions are marked sensitive /
+insensitive in sync with the existing "Insert" menu items which are
+already in the "individual" group.
+
+Though not introduced with the other symptoms of this bug
+(0597b877c5bf4d21ac4048742ddf6b11e24877ba), the descreptency fixed
+here is integrally related.
+---
+ calendar/gui/dialogs/comp-editor.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
+index 7d27474..10390e6 100644
+--- a/calendar/gui/dialogs/comp-editor.c
++++ b/calendar/gui/dialogs/comp-editor.c
+@@ -36,6 +36,7 @@
+ #include <glib/gstdio.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <e-util/e-util.h>
++#include <e-util/e-binding.h>
+ #include <e-util/e-dialog-utils.h>
+ #include <e-util/e-util-private.h>
+ #include <e-util/gconf-bridge.h>
+@@ -1553,6 +1554,7 @@ comp_editor_init (CompEditor *editor)
+ 	GtkTargetList *target_list;
+ 	GtkTargetEntry *targets;
+ 	GtkActionGroup *action_group;
++	GtkActionGroup *action_group_2;
+ 	GtkAction *action;
+ 	GtkWidget *container;
+ 	GtkWidget *widget;
+@@ -1746,6 +1748,13 @@ comp_editor_init (CompEditor *editor)
+ 	gtk_window_set_type_hint (
+ 		GTK_WINDOW (editor), GDK_WINDOW_TYPE_HINT_NORMAL);
+ 
++	action_group = comp_editor_get_action_group (editor, "individual");
++	action_group_2 = e_attachment_view_get_action_group (view, "editable");
++
++	e_binding_new (
++		action_group, "sensitive",
++		action_group_2, "sensitive");
++
+ 	/* Listen for attachment store changes. */
+ 
+ 	store = e_attachment_view_get_store (view);
+-- 
+1.7.1
+
diff --git a/mail-client/evolution/files/evolution-2.28.3.1-attachment-bar-RTL.patch b/mail-client/evolution/files/evolution-2.28.3.1-attachment-bar-RTL.patch
new file mode 100644
index 000000000000..23477b285e6c
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.28.3.1-attachment-bar-RTL.patch
@@ -0,0 +1,34 @@
+From ff2553440bd1f7d76667e71479d50efa1a537e96 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Mon, 29 Mar 2010 11:22:23 -0400
+Subject: [PATCH 05/14] Bug 614049 - Attachment bar causes drawing issues in RTL locales
+
+---
+ widgets/misc/e-attachment-paned.c |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
+index 8e25098..aefd9fa 100644
+--- a/widgets/misc/e-attachment-paned.c
++++ b/widgets/misc/e-attachment-paned.c
+@@ -614,10 +614,15 @@ attachment_paned_init (EAttachmentPaned *paned)
+ 
+ 	/* Request the width to be as large as possible, and let the
+ 	 * GtkExpander allocate what space there is.  This effectively
+-	 * packs the widget to expand. */
++	 * packs the widget to expand.
++	 *
++	 * XXX This hack causes nasty side-effects in RTL locales,
++	 *     so check the reading direction before applying it.
++	 *     See GNOME bug #614049 for details + screenshot. */
+ 	widget = gtk_hbox_new (FALSE, 6);
+ 	gtk_size_group_add_widget (size_group, widget);
+-	gtk_widget_set_size_request (widget, G_MAXINT, -1);
++	if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
++		gtk_widget_set_size_request (widget, G_MAXINT, -1);
+ 	gtk_expander_set_label_widget (GTK_EXPANDER (container), widget);
+ 	gtk_widget_show (widget);
+ 
+-- 
+1.7.1
+
diff --git a/mail-client/evolution/files/evolution-2.28.3.1-unknown-attachment-size.patch b/mail-client/evolution/files/evolution-2.28.3.1-unknown-attachment-size.patch
new file mode 100644
index 000000000000..4212afbd0835
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.28.3.1-unknown-attachment-size.patch
@@ -0,0 +1,37 @@
+From 02007387a6104aa1d7c7bdc351189cd055a02a58 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Tue, 11 May 2010 13:13:10 -0500
+Subject: [PATCH 11/14] Bug 616640 - Don't display attachment size if it's unknown
+
+---
+ widgets/misc/e-attachment-tree-view.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c
+index 42876e4..5729a68 100644
+--- a/widgets/misc/e-attachment-tree-view.c
++++ b/widgets/misc/e-attachment-tree-view.c
+@@ -100,15 +100,18 @@ attachment_tree_view_render_size (GtkTreeViewColumn *column,
+                                   GtkTreeModel *model,
+                                   GtkTreeIter *iter)
+ {
+-	gchar *display_size;
++	gchar *display_size = NULL;
+ 	gint column_id;
+ 	guint64 size;
+ 
+ 	column_id = E_ATTACHMENT_STORE_COLUMN_SIZE;
+ 	gtk_tree_model_get (model, iter, column_id, &size, -1);
+ 
+-	display_size = g_format_size_for_display ((goffset) size);
++	if (size > 0)
++		display_size = g_format_size_for_display ((goffset) size);
++
+ 	g_object_set (renderer, "text", display_size, NULL);
++
+ 	g_free (display_size);
+ }
+ 
+-- 
+1.7.1
+