From e5c7ee01fd8892709c7c6d7e925fdbaa37ff406e Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Wed, 19 Sep 2001 18:46:34 +0000 Subject: listen for model changes (task_editor_edit_comp): add the attendees to the 2001-09-19 JP Rosevear * gui/dialogs/task-editor.c (init_widgets): listen for model changes (task_editor_edit_comp): add the attendees to the model and notify of need send (row_count_changed_cb): mark as changed when row added/deleted (model_row_changed_cb): mark as changed when row changes * gui/dialogs/event-editor.c (init_widgets): listen for model changes (event_editor_init): flip page order (event_editor_edit_comp): set needs send value (schedule_meeting_cmd): flip page order (row_count_changed_cb): mark as changed when row added/deleted (model_row_changed_cb): mark as changed when row changes * gui/dialogs/schedule-page.c: remove model change notification stuff (schedule_page_fill_widgets): no need to do the needs_send here because the editor handles this since it owns the model * gui/dialogs/event-editor.c (init_widgets): listen for model changes (event_editor_init): flip page order (event_editor_edit_comp): set needs send value (schedule_meeting_cmd): flip page order (row_count_changed_cb): mark as changed when row added/deleted (model_row_changed_cb): mark as changed when row changes * gui/dialogs/meeting-page.c (meeting_page_fill_widgets): no need to do the needs_send here because the editor handles this since it owns the model (invite_entry_changed): ditto * gui/dialogs/comp-editor.c (comp_editor_set_changed): new accessor (comp_editor_get_changed): ditto (comp_editor_set_needs_send): ditto (comp_editor_get_needs_send): ditto * gui/dialogs/comp-editor.h: new protos * gui/itip-utils.c (itip_addresses_get): reflect configuration path changes in the mailer * gui/e-meeting-model.c: remove commented out code, ifdef one section for later svn path=/trunk/; revision=12983 --- calendar/gui/itip-utils.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'calendar/gui/itip-utils.c') diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 8811db3487..7a5411d752 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -84,8 +84,7 @@ itip_addresses_get (void) static Bonobo_ConfigDatabase db = NULL; CORBA_Environment ev; GList *addresses = NULL; - gboolean have_default = FALSE; - gint len, i; + gint len, def, i; if (db == NULL) { CORBA_exception_init (&ev); @@ -103,6 +102,7 @@ itip_addresses_get (void) } len = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL); + def = bonobo_config_get_long_with_default (db, "/Mail/Accounts/default_account", 0, NULL); for (i = 0; i < len; i++) { ItipAddress *a; @@ -119,24 +119,13 @@ itip_addresses_get (void) a->address = bonobo_config_get_string (db, path, NULL); g_free (path); - path = g_strdup_printf ("/Mail/Accounts/account_is_default_%d", i); - a->default_address = !have_default && bonobo_config_get_boolean (db, path, NULL); - - if (a->default_address) - have_default = TRUE; - g_free (path); + if (i == def) + a->default_address = TRUE; a->full = g_strdup_printf ("%s <%s>", a->name, a->address); addresses = g_list_append (addresses, a); } - /* If nothing was marked as default */ - if (!have_default && addresses != NULL) { - ItipAddress *a = addresses->data; - - a->default_address = TRUE; - } - return addresses; } -- cgit v1.2.3