diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit-config.h | 2 | ||||
| -rw-r--r-- | calendar/conduits/todo/todo-conduit-config.h | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/meeting-page.c | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index dad0a00284..5a41faecb9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2001-10-29 JP Rosevear <jpr@ximian.com> + + * conduits/todo/todo-conduit-config.h + (todoconduit_load_configuration): get the management object by id + + * conduits/calendar/calendar-conduit-config.h + (calconduit_load_configuration): ditto + 2001-10-29 Rodrigo Moya <rodrigo@ximian.com> * gui/calendar-config.[ch] (calendar_config_get_default_uri): diff --git a/calendar/conduits/calendar/calendar-conduit-config.h b/calendar/conduits/calendar/calendar-conduit-config.h index f18fcb290a..c231a59008 100644 --- a/calendar/conduits/calendar/calendar-conduit-config.h +++ b/calendar/conduits/calendar/calendar-conduit-config.h @@ -52,7 +52,7 @@ calconduit_load_configuration (ECalConduitCfg **c, guint32 pilot_id) (*c)->pilot_id = pilot_id; - management = gnome_pilot_conduit_management_new ("ECalendar", GNOME_PILOT_CONDUIT_MGMT_NAME); + management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); config = gnome_pilot_conduit_config_new (management, pilot_id); if (!gnome_pilot_conduit_config_is_enabled (config, &(*c)->sync_type)) (*c)->sync_type = GnomePilotConduitSyncTypeNotSet; diff --git a/calendar/conduits/todo/todo-conduit-config.h b/calendar/conduits/todo/todo-conduit-config.h index c9a70ac363..010315291c 100644 --- a/calendar/conduits/todo/todo-conduit-config.h +++ b/calendar/conduits/todo/todo-conduit-config.h @@ -52,7 +52,7 @@ todoconduit_load_configuration (EToDoConduitCfg **c, guint32 pilot_id) (*c)->pilot_id = pilot_id; - management = gnome_pilot_conduit_management_new ("EToDo", GNOME_PILOT_CONDUIT_MGMT_NAME); + management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); config = gnome_pilot_conduit_config_new (management, pilot_id); if (!gnome_pilot_conduit_config_is_enabled (config, &(*c)->sync_type)) (*c)->sync_type = GnomePilotConduitSyncTypeNotSet; diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index 3127f9aa6b..f4324cc2dd 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -240,7 +240,6 @@ meeting_page_destroy (GtkObject *object) { MeetingPage *mpage; MeetingPagePrivate *priv; - ETable *real_table; g_return_if_fail (object != NULL); g_return_if_fail (IS_MEETING_PAGE (object)); |