Fixed some warnings.

2000-03-27  Christopher James Lahey  <clahey@helixcode.com>

        * addressbook/backend/ebook/test-card.c: Fixed some warnings.

        * addressbook/backend/ebook/test-client.c: Added a section to test
        cursors and returning an id when adding.

        * addressbook/backend/ebook/e-card-pairs.h: Removed the address
        pairs since they were added to e-card.c.

        * addressbook/backend/ebook/e-card.c,
        addressbook/backend/ebook/e-card.h: Made the set_id function take
        a const char *.

        * addressbook/backend/ebook/e-book-listener.c,
        addressbook/backend/ebook/e-book-listener.h,
        addressbook/backend/ebook/e-book.c,
        addressbook/backend/ebook/e-book.h,
        addressbook/backend/idl/addressbook.idl,
        addressbook/backend/pas/pas-backend-file.c,
        addressbook/backend/pas/pas-book.c,
        addressbook/backend/pas/pas-book.h: Added a get_all_cards function
        and made the response to the create_card function include the card
        id.

        * addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and
        e-card-cursor.h.

        * addressbook/backend/ebook/e-card-cursor.c,
        addressbook/backend/ebook/e-card-cursor.h: New class for proxying
        to an Evolution_CardCursor.

        * addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and
        pas-card-cursor.h.

        * addressbook/backend/pas/pas-card-cursor.c,
        addressbook/backend/pas/pas-card-cursor.h: New bonobo class for
        making an Evolution_CardCursor server.

svn path=/trunk/; revision=2205

1 files changed, 20 insertions, 13 deletions

diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
index 5477a4f615..3e9523e86f 100644
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ b/addressbook/backend/ebook/e-card-cursor.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *
  * Author:
@@ -6,36 +7,42 @@
  * Copyright 2000, Helix Code, Inc.
  */
 
-#include <gtk/gtkobject.h>
+#ifndef __E_CARD_CURSOR_H__
+#define __E_CARD_CURSOR_H__
+
 #include <libgnome/gnome-defs.h>
+#include <gtk/gtk.h>
+#include "addressbook.h"
 
-#include <e-book.h>
+typedef struct _ECardCursor        ECardCursor;
 
-#ifndef __E_CARD_CURSOR_H__
-#define __E_CARD_CURSOR_H__
+#include <e-book.h>
 
 BEGIN_GNOME_DECLS
 
 typedef struct _ECardCursorPrivate ECardCursorPrivate;
+typedef struct _ECardCursorClass   ECardCursorClass;
 
-typedef struct {
-	GtkObject     parent;
+struct _ECardCursor {
+	GtkObject           parent;
 	ECardCursorPrivate *priv;
-} ECardCursor;
+};
 
-typedef struct {
+struct _ECardCursorClass {
 	GtkObjectClass parent;
-} ECardCursorClass;
+};
 
 /* Creating a new addressbook. */
-ECardCursor *e_card_cursor_new         (EBook                *book,
-					Evolution_CardCursor  corba_cursor);
+ECardCursor *e_card_cursor_new       (Evolution_CardCursor  corba_cursor);
+ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,
+				      Evolution_CardCursor  corba_cursor);
+
 GtkType      e_card_cursor_get_type    (void);
 
 /* Fetching cards. */
-int          e_card_cursor_get_length  (ECardCursor          *cursor);
+long         e_card_cursor_get_length  (ECardCursor          *cursor);
 ECard       *e_card_cursor_get_nth     (ECardCursor          *cursor,
-					int                   nth);
+					const long            nth);
 #define E_CARD_CURSOR_TYPE        (e_card_cursor_get_type ())
 #define E_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), E_CARD_CURSOR_TYPE, ECardCursor))
 #define E_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARD_CURSOR_TYPE, ECardCursorClass))