diff options
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card-simple.c | 2 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card.c | 2 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-file.c | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 7e3cc004fc..891f4cc540 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2000-08-05 Christopher James Lahey <clahey@helixcode.com> + + * backend/ebook/e-card-simple.c: Fixed a warning. + + * backend/ebook/e-card.c: Cast to (char *) in + e_card_load_cards_from_file since libversit isn't const correct. + + * backend/pas/pas-backend-file.c: Fixed a warning. + 2000-08-04 Michael Meeks <michael@helixcode.com> * gui/component/addressbook.c (control_activate): unref. diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c index ddad7249dd..0efda1a8d7 100644 --- a/addressbook/backend/ebook/e-card-simple.c +++ b/addressbook/backend/ebook/e-card-simple.c @@ -918,6 +918,8 @@ char *e_card_simple_get (ECardSimple *simple, "org", &string, NULL); return g_strdup(string); + default: + return NULL; } default: return NULL; diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 85ef7366d5..a81544dcd3 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -1692,7 +1692,7 @@ e_card_init (ECard *card) GList * e_card_load_cards_from_file(const char *filename) { - VObject *vobj = Parse_MIME_FromFileName(filename); + VObject *vobj = Parse_MIME_FromFileName((char *) filename); GList *list = NULL; while(vobj) { VObject *next; diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index 6ae6a829cc..a64a94c402 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -312,7 +312,7 @@ func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data { PASBackendFileSearchContext *ctx = data; - return entry_compare (ctx, f, argc, argv, e_strstrcase); + return entry_compare (ctx, f, argc, argv, (char *(*)(const char*, const char*)) e_strstrcase); } static char * |