diff options
| author | JP Rosevear <jpr@ximian.com> | 2001-10-31 07:43:36 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2001-10-31 07:43:36 +0800 |
| commit | 30a5a8360b245210cf23980cb37f1632dff7087f (patch) | |
| tree | 9e4f0e12e8fa6a8fe97ba9e99c152e8a191270ac | |
| parent | d0b753cecba2b0b41ede537c7a386e92940a01ba (diff) | |
| download | gsoc2013-evolution-30a5a8360b245210cf23980cb37f1632dff7087f.tar.gz gsoc2013-evolution-30a5a8360b245210cf23980cb37f1632dff7087f.tar.zst gsoc2013-evolution-30a5a8360b245210cf23980cb37f1632dff7087f.zip | |
don't overwrite memory (e_meeting_time_selector_on_end_time_changed):
2001-10-30 JP Rosevear <jpr@ximian.com>
* gui/e-meeting-time-sel.c
(e_meeting_time_selector_on_start_time_changed): don't overwrite
memory
(e_meeting_time_selector_on_end_time_changed): ditto
svn path=/trunk/; revision=14506
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 10 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 13 |
3 files changed, 27 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a78c5ffadf..d2e4a564b7 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2001-10-30 JP Rosevear <jpr@ximian.com> + + * gui/e-meeting-time-sel.c + (e_meeting_time_selector_on_start_time_changed): don't overwrite + memory + (e_meeting_time_selector_on_end_time_changed): ditto + 2001-10-30 Damon Chaplin <damon@ximian.com> * gui/calendar-model.c (dup_date_edit_value): return NULL if passed diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 6fc739967b..f5f16bdc9c 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -2085,6 +2085,7 @@ e_meeting_time_selector_on_start_time_changed (GtkWidget *widget, { gint duration_days, duration_hours, duration_minutes; EMeetingTime mtstime; + gint hour = 0, minute = 0; time_t newtime; /* Date */ @@ -2093,7 +2094,9 @@ e_meeting_time_selector_on_start_time_changed (GtkWidget *widget, g_date_set_time (&mtstime.date, newtime); /* Time */ - e_date_edit_get_time_of_day (E_DATE_EDIT (mts->start_date_edit), &mtstime.hour, &mtstime.minute); + e_date_edit_get_time_of_day (E_DATE_EDIT (mts->start_date_edit), &hour, &minute); + mtstime.hour = hour; + mtstime.minute = minute; /* If the time hasn't changed, just return. */ if (e_meeting_time_selector_compare_times (&mtstime, &mts->meeting_start_time) == 0) @@ -2126,6 +2129,7 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, EMeetingTimeSelector *mts) { EMeetingTime mtstime; + gint hour = 0, minute = 0; time_t newtime; /* Date */ @@ -2136,7 +2140,9 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, g_date_add_days (&mtstime.date, 1); /* Time */ - e_date_edit_get_time_of_day (E_DATE_EDIT (mts->end_date_edit), &mtstime.hour, &mtstime.minute); + e_date_edit_get_time_of_day (E_DATE_EDIT (mts->end_date_edit), &hour, &minute); + mtstime.hour = hour; + mtstime.minute = minute; /* If the time hasn't changed, just return. */ if (e_meeting_time_selector_compare_times (&mtstime, &mts->meeting_end_time) == 0) diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 013787ee39..454f18a75c 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -323,6 +323,12 @@ comp_subject (CalComponent *comp) } static CORBA_char * +comp_body (CalComponent *comp) +{ + return CORBA_string_dup (""); +} + +static CORBA_char * comp_content_type (CalComponentItipMethod method) { char tmp[256]; @@ -673,7 +679,7 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp) GNOME_Evolution_Composer_RecipientList *to_list = NULL; GNOME_Evolution_Composer_RecipientList *cc_list = NULL; GNOME_Evolution_Composer_RecipientList *bcc_list = NULL; - CORBA_char *subject = NULL, *content_type = NULL; + CORBA_char *body = NULL, *subject = NULL, *content_type = NULL; CORBA_char *filename = NULL, *description = NULL; GNOME_Evolution_Composer_AttachmentData *attach_data = NULL; CORBA_boolean show_inline; @@ -710,6 +716,9 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp) goto cleanup; } + /* Body of the message */ + body = comp_body (comp); + /* Content type, suggested file name, description */ content_type = comp_content_type (method); filename = comp_filename (comp); @@ -758,6 +767,8 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp) if (subject != NULL) CORBA_free (subject); + if (body != NULL) + CORBA_free (body); if (content_type != NULL) CORBA_free (content_type); if (filename != NULL) |