Add e-book-view-private and move all of the internal Bonobo functions

2006-11-06  Ross Burton  <ross@openedhand.com>

	* libebook/Makefile.am:
	* libebook/e-book-view-private.h:
	* libebook/e-book-view.c:
	* libebook/e-book-view.h:
	* libebook/e-book.c:
	* libebook/e-book.h:
	Add e-book-view-private and move all of the internal Bonobo
	functions there, so the public API doesn't expose Bonobo (#45052).

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d97f6c2..0484294 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-06  Ross Burton  <ross@openedhand.com>
+
+       * libebook/Makefile.am:
+       * libebook/e-book-view-private.h:
+       * libebook/e-book-view.c:
+       * libebook/e-book-view.h:
+       * libebook/e-book.c:
+       * libebook/e-book.h:
+       Add e-book-view-private and move all of the internal Bonobo
+       functions there, so the public API doesn't expose Bonobo (#45052).
+
 2006-09-29  Devashish Sharma  <sdevashish@novell.com>
 
        * backends/ldap/e-book-backend-ldap.c :

diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 2270804..06a038b 100644 (file)
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -40,6 +40,7 @@ libebook_1_2_la_SOURCES =                                     \
        e-book-listener.c                               \
        e-book-query.c                                  \
        e-book-view-listener.c                          \
+       e-book-view-private.h                                   \
        e-book-view.c                                   \
        e-book.c                                        \
        e-contact.c                                     \

diff --git a/addressbook/libebook/e-book-view-private.h b/addressbook/libebook/e-book-view-private.h
new file mode 100644 (file)
index 0000000..7167cf9
--- /dev/null
+++ b/addressbook/libebook/e-book-view-private.h
@@ -0,0 +1,24 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * The Evolution addressbook client object.
+ *
+ * Author:
+ *   Nat Friedman (nat@ximian.com)
+ *
+ * Copyright 1999, 2000, Ximian, Inc.
+ */
+
+#ifndef __E_BOOK_VIEW_PRIVATE_H__
+#define __E_BOOK_VIEW_PRIVATE_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <libebook/Evolution-DataServer-Addressbook.h>
+#include <libebook/e-book-view-listener.h>
+
+/* Creating a new addressbook. */
+EBookView *e_book_view_new (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener);
+
+G_END_DECLS
+
+#endif /* ! __E_BOOK_VIEW_PRIVATE_H__ */

diff --git a/addressbook/libebook/e-book-view.c b/addressbook/libebook/e-book-view.c
index 8153d54..74c5fd8 100644 (file)
--- a/addressbook/libebook/e-book-view.c
+++ b/addressbook/libebook/e-book-view.c
@@ -12,6 +12,7 @@
 
 #include "e-book-view-listener.h"
 #include "e-book-view.h"
+#include "e-book-view-private.h"
 #include "e-book.h"
 #include "e-book-marshal.h"
 

diff --git a/addressbook/libebook/e-book-view.h b/addressbook/libebook/e-book-view.h
index 3540eea..8f81aad 100644 (file)
--- a/addressbook/libebook/e-book-view.h
+++ b/addressbook/libebook/e-book-view.h
@@ -13,8 +13,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <libebook/Evolution-DataServer-Addressbook.h>
-#include <libebook/e-book-view-listener.h>
+#include "e-book-types.h"
 
 #define E_TYPE_BOOK_VIEW           (e_book_view_get_type ())
 #define E_BOOK_VIEW(o)             (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_BOOK_VIEW, EBookView))
@@ -57,9 +56,6 @@ struct _EBookViewClass {
        void (*_ebook_reserved4) (void);
 };
 
-/* Creating a new addressbook. */
-EBookView         *e_book_view_new                    (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener);
-
 GType              e_book_view_get_type               (void);
 
 void               e_book_view_start                  (EBookView *book_view);

diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 3228855..3762b3f 100644 (file)
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include "e-book.h"
+#include "e-book-view-private.h"
 #include "e-vcard.h"
 
 #include <bonobo-activation/bonobo-activation.h>

diff --git a/addressbook/libebook/e-book.h b/addressbook/libebook/e-book.h
index 91e4f48..16b0aca 100644 (file)
--- a/addressbook/libebook/e-book.h
+++ b/addressbook/libebook/e-book.h
@@ -14,14 +14,13 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libebook/Evolution-DataServer-Addressbook.h>
-#include <libedataserver/e-source.h>
 #include <libedataserver/e-list.h>
+#include <libedataserver/e-source.h>
+#include <libedataserver/e-source-list.h>
 #include <libebook/e-contact.h>
 #include <libebook/e-book-query.h>
 #include <libebook/e-book-view.h>
 #include <libebook/e-book-types.h>
-#include <libedataserver/e-source-list.h>
 
 #define E_TYPE_BOOK        (e_book_get_type ())
 #define E_BOOK(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_BOOK, EBook))