diff options
| -rw-r--r-- | calendar/ChangeLog | 15 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor-util.c | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/e-delegate-dialog.c | 9 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-model.c | 4 |
4 files changed, 25 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 63ac0071cc..408a79bd7b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,18 @@ +2002-11-19 Not Zed <NotZed@Ximian.com> + + * gui/e-meeting-model.c (get_select_name_dialog): pass type to + bonobo_widget::set_property. + (select_names_ok_cb): ", for get_property. + + * gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct): + pass type to bonobo_widget::set_property & plug small leak. + (e_delegate_dialog_get_delegate): ", for get_property. + (e_delegate_dialog_get_delegate_name): " + + * gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget): + pass type to bonobo_widget::set_property. + (comp_editor_contacts_to_component): ", for get_property + 2002-11-16 Chris Toshok <toshok@ximian.com> * gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set): diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 8d56097bff..90d0bc3496 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -446,7 +446,7 @@ comp_editor_contacts_to_widget (GtkWidget *contacts_entry, #endif bonobo_widget_set_property (BONOBO_WIDGET (contacts_entry), - "destinations", contacts_string, NULL); + "destinations", TC_CORBA_string, contacts_string, NULL); g_free (contacts_string); @@ -471,7 +471,7 @@ comp_editor_contacts_to_component (GtkWidget *contacts_entry, int i; bonobo_widget_get_property (BONOBO_WIDGET (contacts_entry), - "destinations", &contacts_string, NULL); + "destinations", TC_CORBA_string, &contacts_string, NULL); #if 0 g_print ("Contacts string: %s\n", contacts_string ? contacts_string : ""); #endif diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index c42bd3ca95..5e890221e5 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -151,6 +151,7 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char EDestination *destv[2] = {NULL, NULL}; Bonobo_Control corba_control; CORBA_Environment ev; + char *str; g_return_val_if_fail (edd != NULL, NULL); g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL); @@ -204,7 +205,9 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char 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); + str = e_destination_exportv(destv); + bonobo_widget_set_property (BONOBO_WIDGET (priv->entry), "destinations", TC_CORBA_string, str, NULL); + g_free(str); gtk_object_unref (GTK_OBJECT (dest)); gtk_signal_connect (GTK_OBJECT (priv->addressbook), "clicked", @@ -282,7 +285,7 @@ e_delegate_dialog_get_delegate (EDelegateDialog *edd) priv = edd->priv; - bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", &string, NULL); + bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", TC_CORBA_string, &string, NULL); destv = e_destination_importv (string); if (destv && destv[0] != NULL) { @@ -309,7 +312,7 @@ e_delegate_dialog_get_delegate_name (EDelegateDialog *edd) priv = edd->priv; - bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", &string, NULL); + bonobo_widget_get_property (BONOBO_WIDGET (priv->entry), "destinations", TC_CORBA_string, &string, NULL); destv = e_destination_importv (string); g_message ("importv: [%s]", string); diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index af89468255..fd1ffa50df 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -1711,7 +1711,7 @@ get_select_name_dialog (EMeetingModel *im) control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL); - bonobo_widget_set_property (BONOBO_WIDGET (control_widget), "text", "", NULL); + bonobo_widget_set_property (BONOBO_WIDGET (control_widget), "text", TC_CORBA_string, "", NULL); } CORBA_exception_free (&ev); @@ -1809,7 +1809,7 @@ select_names_ok_cb (BonoboListener *listener, control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL); - bonobo_widget_get_property (BONOBO_WIDGET (control_widget), "destinations", &string, NULL); + bonobo_widget_get_property (BONOBO_WIDGET (control_widget), "destinations", TC_CORBA_string, &string, NULL); destv = e_destination_importv (string); if (destv != NULL) { process_section (im, destv, roles[i]); |