diff options
| author | JP Rosevear <jpr@novell.com> | 2005-01-04 04:20:06 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2005-01-04 04:20:06 +0800 |
| commit | e21fe755599c9a1b23ba83cc92d1ed12c8821cf4 (patch) | |
| tree | 22cc192e0b53165f869e8b2dbe692dd8de4d18a4 /plugins/itip-formatter | |
| parent | 67d95ccf06a97a1d0f8492fe572d587cc47325bd (diff) | |
| download | gsoc2013-evolution-e21fe755599c9a1b23ba83cc92d1ed12c8821cf4.tar gsoc2013-evolution-e21fe755599c9a1b23ba83cc92d1ed12c8821cf4.tar.gz gsoc2013-evolution-e21fe755599c9a1b23ba83cc92d1ed12c8821cf4.tar.bz2 gsoc2013-evolution-e21fe755599c9a1b23ba83cc92d1ed12c8821cf4.tar.lz gsoc2013-evolution-e21fe755599c9a1b23ba83cc92d1ed12c8821cf4.tar.xz gsoc2013-evolution-e21fe755599c9a1b23ba83cc92d1ed12c8821cf4.tar.zst gsoc2013-evolution-e21fe755599c9a1b23ba83cc92d1ed12c8821cf4.zip | |
remove unused message
2005-01-03 JP Rosevear <jpr@novell.com>
* org-gnome-itip-formatter-errors.xml: remove unused message
* itip-formatter.c (update_item): use info item, not e-error
svn path=/trunk/; revision=28223
Diffstat (limited to 'plugins/itip-formatter')
| -rw-r--r-- | plugins/itip-formatter/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-formatter.c | 10 | ||||
| -rw-r--r-- | plugins/itip-formatter/org-gnome-itip-formatter-errors.xml | 5 |
3 files changed, 12 insertions, 9 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 09a89065f9..488ce34a51 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,5 +1,11 @@ 2005-01-03 JP Rosevear <jpr@novell.com> + * org-gnome-itip-formatter-errors.xml: remove unused message + + * itip-formatter.c (update_item): use info item, not e-error + +2005-01-03 JP Rosevear <jpr@novell.com> + * itip-formatter.c (view_response_cb): implement cancel (update_item): add cancel info item diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index a4c084c728..36367c5677 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -622,6 +622,7 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response) struct icaltimetype stamp; icalproperty *prop; icalcomponent *clone; + ESource *source; GError *error = NULL; /* Set X-MICROSOFT-CDO-REPLYTIME to record the time at which @@ -642,18 +643,19 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response) icalcomponent_add_component (pitip->top_level, clone); icalcomponent_set_method (pitip->top_level, pitip->method); + source = e_cal_get_source (pitip->current_ecal); + if (!e_cal_receive_objects (pitip->current_ecal, pitip->top_level, &error)) { - /* FIXME Really use e_error? or should it just be an info item */ -// e_error_run (NULL, "org.gnome.itip-formatter:meeting-update-failed", error->message, NULL); + itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, + _("Unable to send item to calendar '%s'. %s"), + e_source_peek_name (source), error->message); g_error_free (error); } else { - ESource *source; /* FIXME This makes the UI look ugly */ itip_view_set_source_list (ITIP_VIEW (pitip->view), NULL); itip_view_clear_lower_info_items (ITIP_VIEW (pitip->view)); - source = e_cal_get_source (pitip->current_ecal); switch (response) { case ITIP_VIEW_RESPONSE_ACCEPT: diff --git a/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml b/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml index 7ed8c46d4b..f8f462a1e8 100644 --- a/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml +++ b/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <error-list domain="org.gnome.itip-formatter"> - <error id="meeting-update-failed" type="error"> - <primary>Unable to save meeting to calendar</primary> - <secondary>The error sent back was "{0}".</secondary> - </error> - <error id="add-unknown-attendee" type="question"> <primary>This response is not from a current attendee. Add the sender as an attendee?</primary> </error> |