diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/Evolution-Composer.idl | 94 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 4 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-edit.c | 4 |
4 files changed, 10 insertions, 98 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 9039634f44..bd6ed976e6 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -3,6 +3,12 @@ * removed the Evolution-Composer generated files, due to a tip on how we do things. + * gui/e-meeting-edit.c: I fixed a bunch of memory-deallocation + bugs, and finished the initial integration with the mailer. + + * gui/Makefile.am: made the build us the Evolution-Composer.idl + from the composer directory. + 2000-10-25 Jesse Pavel <jpavel@helixcode.com> * gui/Evolution-Composer.idl: added this from the composer IDL sources diff --git a/calendar/gui/Evolution-Composer.idl b/calendar/gui/Evolution-Composer.idl deleted file mode 100644 index 1e3701a594..0000000000 --- a/calendar/gui/Evolution-Composer.idl +++ /dev/null @@ -1,94 +0,0 @@ -/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Evolution-Composer.idl: Mail composer interfaces for Evolution - * - * Author: - * Dan Winship <danw@helixcode.com> - * - * (C) 2000 Helix Code, Inc. - */ - -#include <Bonobo.idl> - -module Evolution { - - interface Composer : Bonobo::Unknown { - struct Recipient { - string name; /* UTF-8 */ - string address; - }; - typedef sequence<Recipient> RecipientList; - - /** - * set_headers: - * @to: the "To" recipients - * @cc: the "CC" recipients - * @bcc: the "Bcc" recipients - * @subject: the subject of the message - * - * Sets the composer headers. Any of @to, @cc, and - * @bcc may be an empty list, and @subject may be an - * empty string. - **/ - void set_headers (in RecipientList to, in RecipientList cc, - in RecipientList bcc, in string subject); - - /** - * set_body_text: - * @body: the body - * - * Sets the text in the body of the composer to - * the given UTF-8 plain text. - **/ - void set_body_text (in string body); - - /** - * attach_MIME: - * @data: the attachment data - * - * This adds an attachment to the composer. @data - * should be a fully-formed MIME body part. - **/ - exception CouldNotParse {}; - void attach_MIME (in string data) - raises (CouldNotParse); - - /** - * attach_data: - * @content_type: the Content-Type header - * @filename: the suggested filename, or "" - * @description: a description of the data, or "" - * @show_inline: whether the attachment should be - * displayed inline or not. - * @data: the raw attachment data - * - * This adds @data as an attachment, using the provided - * information to generate MIME headers. @content_type - * may contain just a MIME content type, or it may - * contain a complete Content-Type header. @filename - * is a filename for the Content-Disposition header - * @description (if not "") provides the - * Content-Description, and @show_inline determines if the - * Content-Disposition is "inline" or "attachment". - * - * If you need to specify headers or values other than - * what this function can do, you will need to generate - * all of the MIME headers yourself and use - * add_attachment (). - **/ - void attach_data (in string content_type, - in string filename, - in string description, - in boolean show_inline, - in string data); - - - /** - * show: - * - * Shows the composer and lets the user edit things - * and send the message. - **/ - void show (); - }; -}; diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 7e13a47ff7..63dd31d327 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -1,7 +1,7 @@ ## CORBA stuff IDLS = \ - Evolution-Composer.idl + $(srcdir)/../../composer/Evolution-Composer.idl IDL_GENERATED = \ Evolution-Composer.h \ @@ -11,7 +11,7 @@ IDL_GENERATED = \ $(IDL_GENERATED): $(IDLS) $(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ - -I . Evolution-Composer.idl + -I . $(srcdir)/../../composer/Evolution-Composer.idl ## diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c index fa7f609dfe..54283f3f35 100644 --- a/calendar/gui/e-meeting-edit.c +++ b/calendar/gui/e-meeting-edit.c @@ -641,6 +641,7 @@ send_button_clicked_cb (GtkWidget *widget, gpointer data) recipient = &(to_list->_buffer[cntr]); CORBA_free (recipient->name); CORBA_free (recipient->address); + recipient->name = recipient->address = NULL; } CORBA_free (to_list->_buffer); @@ -654,8 +655,7 @@ send_button_clicked_cb (GtkWidget *widget, gpointer data) CORBA_free (description); CORBA_free (attach_data); - bonobo_object_unref (BONOBO_OBJECT (bonobo_server)); - + bonobo_object_unref (BONOBO_OBJECT (bonobo_server)); } |