diff options
author | JP Rosevear <jpr@ximian.com> | 2001-07-27 09:00:33 +0800 |
---|---|---|
committer | JP Rosevear <jpr@src.gnome.org> | 2001-07-27 09:00:33 +0800 |
commit | 6229cd14f15ac6b3ba82ea5110ced18cc96bde1e (patch) | |
tree | 9a1be40fd5db5a7e1ff54057e822504a694c5d06 /calendar/gui/dialogs/e-delegate-dialog.c | |
parent | 11198e3e269225589650e27c8bbd3d219dac2c9b (diff) | |
download | gsoc2013-evolution-6229cd14f15ac6b3ba82ea5110ced18cc96bde1e.tar gsoc2013-evolution-6229cd14f15ac6b3ba82ea5110ced18cc96bde1e.tar.gz gsoc2013-evolution-6229cd14f15ac6b3ba82ea5110ced18cc96bde1e.tar.bz2 gsoc2013-evolution-6229cd14f15ac6b3ba82ea5110ced18cc96bde1e.tar.lz gsoc2013-evolution-6229cd14f15ac6b3ba82ea5110ced18cc96bde1e.tar.xz gsoc2013-evolution-6229cd14f15ac6b3ba82ea5110ced18cc96bde1e.tar.zst gsoc2013-evolution-6229cd14f15ac6b3ba82ea5110ced18cc96bde1e.zip |
free a list of attendees (meeting_page_fill_widgets): clean up attendee
2001-07-26 JP Rosevear <jpr@ximian.com>
* gui/dialogs/meeting-page.c (cleanup_attendees): free a list of
attendees
(meeting_page_fill_widgets): clean up attendee lists and fix typo
(find_match): add ability to return pos of match
(popup_delete_cb): if deletion happens, make sure to tidy up
delegation chain
* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
use the destination rather than text property
(e_delegate_dialog_get_delegate): ditto
(e_delegate_dialog_new): take name/address pair for dialog default
* gui/dialogs/e-delegate-dialog.h: update protos
* gui/e-itip-control.c (clean_up): only unref the object if we
have one
* gui/itip-control-factory.c (stream_read): make sure we null
terminate the final buffer
* gui/itip-utils.c (itip_send_comp): strip the mailto: from the
organizer address if necessary
svn path=/trunk/; revision=11440
Diffstat (limited to 'calendar/gui/dialogs/e-delegate-dialog.c')
-rw-r--r-- | calendar/gui/dialogs/e-delegate-dialog.c | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index beb93d5dc8..1a245d0d32 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -145,9 +145,11 @@ e_delegate_dialog_destroy (GtkObject *object) EDelegateDialog * -e_delegate_dialog_construct (EDelegateDialog *edd) +e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char *address) { EDelegateDialogPrivate *priv; + EDestination *dest; + EDestination *destv[2] = {NULL, NULL}; Bonobo_Control corba_control; CORBA_Environment ev; @@ -197,7 +199,15 @@ e_delegate_dialog_construct (EDelegateDialog *edd) gtk_widget_show (priv->entry); gtk_box_pack_start (GTK_BOX (priv->hbox), priv->entry, TRUE, TRUE, 0); - + dest = e_destination_new (); + destv[0] = dest; + if (name != NULL && *name) + e_destination_set_name (dest, name); + if (address != NULL && *address) + e_destination_set_email (dest, address); + bonobo_widget_set_property (BONOBO_WIDGET (priv->entry), "destinations", e_destination_exportv (destv), NULL); + gtk_object_unref (GTK_OBJECT (dest)); + gtk_signal_connect (GTK_OBJECT (priv->addressbook), "clicked", GTK_SIGNAL_FUNC (addressbook_clicked_cb), edd); @@ -253,12 +263,12 @@ addressbook_clicked_cb (GtkWidget *widget, gpointer data) * editor could not be created. **/ EDelegateDialog * -e_delegate_dialog_new (void) +e_delegate_dialog_new (const char *name, const char *address) { EDelegateDialog *edd; edd = E_DELEGATE_DIALOG (gtk_type_new (E_TYPE_DELEGATE_DIALOG)); - return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd)); + return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd), name, address); } char * @@ -273,11 +283,9 @@ e_delegate_dialog_get_delegate (EDelegateDialog *edd) priv = edd->priv; - bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "text", &string, NULL); + bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", &string, NULL); destv = e_destination_importv (string); - g_message ("importv: [%s]", string); - if (destv && destv[0] != NULL) { g_free (priv->address); priv->address = g_strdup (e_destination_get_email (destv[0])); @@ -318,24 +326,6 @@ e_delegate_dialog_get_delegate_name (EDelegateDialog *edd) return g_strdup (priv->name); } -void -e_delegate_dialog_set_delegate (EDelegateDialog *edd, - const char *address) -{ - EDelegateDialogPrivate *priv; - - g_return_if_fail (edd != NULL); - g_return_if_fail (E_IS_DELEGATE_DIALOG (edd)); - - priv = edd->priv; - - if (priv->address) - g_free (priv->address); - - priv->address = g_strdup (address); -} - - GtkWidget* e_delegate_dialog_get_toplevel (EDelegateDialog *edd) { |