diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 23 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 32 |
2 files changed, 46 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2377a52882..972e23cec4 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,25 @@ +2000-10-10 Jesse Pavel <jpavel@helixcode.com> + + * gui/e-itip-control.c: set a default size for the control. + +2000-10-10 Jesse Pavel <jpavel@helixcode.com> + + * gui/evolution-calendar.oafinfo: Added information about the + text/calendar MIME type, so that the evolution-calendar is called + to deal with iMIP attachments. + + * gui/e-itip-control.[ch]: These files implement a Bonobo + control that will eventually deal with iMIP/iTIP messages from + the mailer. Right now, it's not working. + + * gui/e-itip-control.glade: The Glade GUI for the above-mentioned + control. + + * gui/Makefile.am: added references to the files I created. + + * gui/main.c: called the initialization function of the Bonobo + control factory. + 2000-10-11 Tuomas Kuosmanen <tigert@helixcode.com> * gui/task-assigned-to.xpm gui/task-assigned.xpm @@ -69,6 +91,7 @@ * conduits/todo/calendar-conduit.h: same as above +>>>>>>> 1.609 2000-10-09 JP Rosevear <jpr@helixcode.com> * conduits/*: Adjust to using gnome-pilot-sync-abs conduit which diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 7c4dc22a4b..670cfed67f 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -17,13 +17,10 @@ #include "e-itip-control.h" -/* - * Bonobo::PersistStream - * - * These two functions implement the Bonobo::PersistStream load and - * save methods which allow data to be loaded into and out of the - * BonoboObject. - */ + +#define DEFAULT_WIDTH 300 +#define DEFAULT_HEIGHT 200 + typedef struct _EItipControlPrivate EItipControlPrivate; @@ -37,7 +34,7 @@ struct _EItipControlPrivate { static void -control_destroy_cb (GtkObject *object, +itip_control_destroy_cb (GtkObject *object, gpointer data) { EItipControlPrivate *priv = data; @@ -46,6 +43,21 @@ control_destroy_cb (GtkObject *object, g_free (priv); } +static void +itip_control_size_request_cb (GtkWidget *widget, GtkRequisition *requisition) +{ + requisition->width = DEFAULT_WIDTH; + requisition->height = DEFAULT_HEIGHT; +} + + +/* + * Bonobo::PersistStream + * + * These two functions implement the Bonobo::PersistStream load and + * save methods which allow data to be loaded into and out of the + * BonoboObject. + */ static char * stream_read (Bonobo_Stream stream) @@ -194,7 +206,9 @@ e_itip_control_factory (BonoboGenericFactory *Factory, void *closure) gtk_text_set_editable (GTK_TEXT (priv->text_box), FALSE); gtk_signal_connect (GTK_OBJECT (priv->main_frame), "destroy", - GTK_SIGNAL_FUNC (control_destroy_cb), priv); + GTK_SIGNAL_FUNC (itip_control_destroy_cb), priv); + gtk_signal_connect (GTK_OBJECT (priv->main_frame), "size_request", + GTK_SIGNAL_FUNC (itip_control_size_request_cb), priv); gtk_widget_show (priv->text_box); gtk_widget_show (priv->main_frame); |