diff options
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/backend/ebook/.cvsignore | 4 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book.c | 8 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card.c | 26 |
4 files changed, 28 insertions, 17 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 48c37565d9..dc2ec55a07 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2000-11-11 Matt Bissiri <bissiri@eecs.umich.edu> + + * backend/ebook/.cvsignore: Add idl-generated files. + * backend/ebook/e-book.c: (e_book_do_response_get_changes): + * backend/ebook/e-card.c: (e_card_send): + s/Evolution_/GNOME_Evolution_/g; + 2000-11-11 Christopher James Lahey <clahey@helixcode.com> * backend/ebook/Makefile.am: Link in composer bonobo code. diff --git a/addressbook/backend/ebook/.cvsignore b/addressbook/backend/ebook/.cvsignore index 1abc66db18..f2ff5428b2 100644 --- a/addressbook/backend/ebook/.cvsignore +++ b/addressbook/backend/ebook/.cvsignore @@ -14,3 +14,7 @@ test-client test-client-list load-pine-addressbook load-gnomecard-addressbook +Evolution-Composer-stubs.c +Evolution-Composer-skels.c +Evolution-Composer-common.c +Evolution-Composer.h diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c index 65925e5036..2e0c6eafef 100644 --- a/addressbook/backend/ebook/e-book.c +++ b/addressbook/backend/ebook/e-book.c @@ -261,15 +261,15 @@ e_book_do_response_get_changes (EBook *book, ((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure); /* - * Release the remote Evolution_Book in the PAS. + * Release the remote GNOME_Evolution_Addressbook_BookView in the PAS. */ CORBA_exception_init (&ev); Bonobo_Unknown_unref (resp->book_view, &ev); if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("e_book_do_response_get_changs: Exception unref'ing " - "remote Evolution_BookView interface!\n"); + g_warning ("e_book_do_response_get_changes: Exception unref'ing " + "remote GNOME_Evolution_Addressbook_BookView interface!\n"); CORBA_exception_free (&ev); CORBA_exception_init (&ev); } @@ -278,7 +278,7 @@ e_book_do_response_get_changes (EBook *book, if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("e_book_do_response_get_changes: Exception releasing " - "remote Evolution_BookView interface!\n"); + "remote GNOME_Evolution_Addressbook_BookView interface!\n"); } CORBA_exception_free (&ev); diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 62c407f871..76ec13af7f 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -3392,7 +3392,7 @@ void e_card_send (ECard *card, ECardDisposition disposition) { BonoboObjectClient *bonobo_server; - Evolution_Composer composer_server; + GNOME_Evolution_Composer composer_server; CORBA_Environment ev; /* First, I obtain an object reference that represents the Composer. */ @@ -3405,18 +3405,18 @@ e_card_send (ECard *card, ECardDisposition disposition) CORBA_exception_init (&ev); if (disposition == E_CARD_DISPOSITION_AS_TO) { - Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list; + GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list; CORBA_char *subject; char *name; EList *email; EIterator *iterator; - Evolution_Composer_Recipient *recipient; + GNOME_Evolution_Composer_Recipient *recipient; /* Now I have to make a CORBA sequence that represents a recipient list with one item, for the card. */ - to_list = Evolution_Composer_RecipientList__alloc (); + to_list = GNOME_Evolution_Composer_RecipientList__alloc (); to_list->_maximum = 1; to_list->_length = 1; - to_list->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (1); + to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (1); gtk_object_get(GTK_OBJECT(card), "full_name", &name, @@ -3435,14 +3435,14 @@ e_card_send (ECard *card, ECardDisposition disposition) recipient->name = CORBA_string_dup(name); - cc_list = Evolution_Composer_RecipientList__alloc (); + cc_list = GNOME_Evolution_Composer_RecipientList__alloc (); cc_list->_maximum = cc_list->_length = 0; - bcc_list = Evolution_Composer_RecipientList__alloc (); + bcc_list = GNOME_Evolution_Composer_RecipientList__alloc (); bcc_list->_maximum = bcc_list->_length = 0; subject = CORBA_string_dup (""); - Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &ev); + GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n"); CORBA_exception_free (&ev); @@ -3481,10 +3481,10 @@ e_card_send (ECard *card, ECardDisposition disposition) attach_data = CORBA_string_dup (tempstr); g_free(tempstr); - Evolution_Composer_attach_data (composer_server, - content_type, filename, description, - show_inline, attach_data, - &ev); + GNOME_Evolution_Composer_attachData (composer_server, + content_type, filename, description, + show_inline, attach_data, + &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n"); @@ -3498,7 +3498,7 @@ e_card_send (ECard *card, ECardDisposition disposition) CORBA_free (attach_data); } - Evolution_Composer_show (composer_server, &ev); + GNOME_Evolution_Composer_show (composer_server, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n"); |