diff options
-rw-r--r-- | composer/ChangeLog | 4 | ||||
-rw-r--r-- | composer/e-msg-composer.c | 2 | ||||
-rw-r--r-- | mail/ChangeLog | 4 | ||||
-rw-r--r-- | mail/main.c | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 383b57f89a..9f5db71457 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,7 @@ +2000-08-12 Michael Meeks <michael@helixcode.com> + + * e-msg-composer.c (get_text): get_text not get_txt. + 2000-08-11 JP Rosevear <jpr@helixcode.com> * e-msg-composer.c (e_msg_composer_new_with_message): Use diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index d60343b2b4..2d74775c7d 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -109,7 +109,7 @@ get_text (Bonobo_PersistStream persist, char *format) format, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Exception getting mail '%s'", - bonobo_exception_get_txt (&ev)); + bonobo_exception_get_text (&ev)); return NULL; } diff --git a/mail/ChangeLog b/mail/ChangeLog index d920ef9640..805e785a98 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2000-08-12 Michael Meeks <michael@helixcode.com> + + * main.c (main): kill using_oaf assertion. + 2000-08-11 Peter Williams <peterw@helixcode.com> * Makefile.am: Make it so that test-mail links diff --git a/mail/main.c b/mail/main.c index 3f59984ad7..b1a8766899 100644 --- a/mail/main.c +++ b/mail/main.c @@ -32,7 +32,6 @@ main (int argc, char *argv []) g_thread_init( NULL ); - od_assert_using_oaf (); gnome_init_with_popt_table ("evolution-mail-component", VERSION, argc, argv, oaf_popt_options, 0, NULL); orb = oaf_init (argc, argv); |