Progress update:

	- Contacts module partially working!

	- Implement UI merging.  Also merge EInfoLabel into ESidebar.
	  The shell window now manages the icon and labels and keeps
	  them up-to-date via EShellView properties.


svn path=/branches/kill-bonobo/; revision=36214

1 files changed, 16 insertions, 7 deletions

diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/addressbook/gui/component/e-book-shell-view-private.h
index 025efd26fc..426b8e9d11 100644
--- a/addressbook/gui/component/e-book-shell-view-private.h
+++ b/addressbook/gui/component/e-book-shell-view-private.h
@@ -23,6 +23,16 @@
 
 #include "e-book-shell-view.h"
 
+#include <string.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+#include <libebook/e-book.h>
+#include <libedataserverui/e-source-selector.h>
+
+#include <eab-menu.h>
+#include <e-activity-handler.h>
+#include <e-addressbook-view.h>
+
 #include <e-book-shell-view-actions.h>
 
 #define E_BOOK_SHELL_VIEW_GET_PRIVATE(obj) \
@@ -60,15 +70,12 @@ struct _EBookShellViewPrivate {
 	/*** Other Stuff ***/
 
 	GtkWidget *notebook;
-	BonoboControl *folder_view_control;
+	GtkWidget *scrolled_window;
+	GtkWidget *selector;
+	GtkWidget *task_bar;
 
-	GtkWidget *statusbar_widget;
 	EActivityHandler *activity_handler;
 
-	GtkWidget *info_widget;
-	GtkWidget *sidebar_widget;
-	GtkWidget *selector;
-
 	GHashTable *uid_to_view;
 	GHashTable *uid_to_editor;
 
@@ -76,7 +83,6 @@ struct _EBookShellViewPrivate {
 	guint activity_id;
 	ESourceList *source_list;
 	gchar *password;
-	EUserCreatableItemsHandler *creatable_items_handler;
 
 	EABMenu *menu;
 };
@@ -94,6 +100,9 @@ void		e_book_shell_view_actions_init
 					(EBookShellView *book_shell_view);
 EABView *	e_book_shell_view_get_current_view
 					(EBookShellView *book_shell_view);
+void		e_book_shell_view_editor_weak_notify
+					(EditorUidClosure *closure,
+					 GObject *where_the_object_was);
 
 G_END_DECLS