=== modified file 'debian/changelog' --- debian/changelog 2010-04-14 11:35:20 +0000 +++ debian/changelog 2010-06-08 17:30:33 +0000 @@ -1,3 +1,13 @@ +evolution (2.28.3-0ubuntu10) lucid-proposed; urgency=low + + * add debian/patches/91_allow_setting_alarms_on_any_meeting_1.patch, + 92_allow_setting_alarms_on_any_meeting_2.patch, + 93_allow_setting_alarms_on_any_meeting_3.patch: + - from upstream git, enable setting alarms on meeting and ungrouping + those actions (LP: #528557) + + -- Didier Roche Tue, 08 Jun 2010 18:31:56 +0200 + evolution (2.28.3-0ubuntu9) lucid; urgency=low * debian/control === added file 'debian/patches/91_allow_setting_alarms_on_any_meeting_1.patch' --- debian/patches/91_allow_setting_alarms_on_any_meeting_1.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/91_allow_setting_alarms_on_any_meeting_1.patch 2010-06-08 16:30:44 +0000 @@ -0,0 +1,162 @@ +From 63fb1857b99f53fbd2506799049b645fce1c1f0c Mon Sep 17 00:00:00 2001 +From: Jim Ramsay +Date: Tue, 18 May 2010 20:39:47 +0000 +Subject: 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. +--- +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); + +-- +cgit v0.8.3.1 === added file 'debian/patches/92_allow_setting_alarms_on_any_meeting_2.patch' --- debian/patches/92_allow_setting_alarms_on_any_meeting_2.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/92_allow_setting_alarms_on_any_meeting_2.patch 2010-06-08 16:27:47 +0000 @@ -0,0 +1,50 @@ +From ff323fa4ae85fb293e0f419a5364823b90562216 Mon Sep 17 00:00:00 2001 +From: Jim Ramsay +Date: Tue, 18 May 2010 20:50:20 +0000 +Subject: 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. +--- +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); +-- +cgit v0.8.3.1 === added file 'debian/patches/93_allow_setting_alarms_on_any_meeting_3.patch' --- debian/patches/93_allow_setting_alarms_on_any_meeting_3.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/93_allow_setting_alarms_on_any_meeting_3.patch 2010-06-08 16:30:55 +0000 @@ -0,0 +1,50 @@ +From 22e540a225da939e9de02912d638402d2353b129 Mon Sep 17 00:00:00 2001 +From: Jim Ramsay +Date: Wed, 28 Apr 2010 14:46:15 +0000 +Subject: 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. +--- +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 + #include + #include ++#include + #include + #include + #include +@@ -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); +-- +cgit v0.8.3.1