Rearranged some of the addressbook code to try and eliminate some circular

dependencies in our libraries.  The circular dependency between the composer
and the mail module is still causing me headaches.  And it doesn't help that
the addressbook and calendar also want to link to the composer.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/shell/e-shell.h b/shell/e-shell.h
index 7bee6b9fff..2c942097c5 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -81,7 +81,7 @@ enum _EShellLineStatus {
 };
 
 GType		e_shell_get_type		(void);
-EShell *	e_shell_new			(gboolean online);
+EShell *	e_shell_get_default		(void);
 GList *		e_shell_list_modules		(EShell *shell);
 const gchar *	e_shell_get_canonical_name	(EShell *shell,
 						 const gchar *name);
@@ -104,7 +104,8 @@ void		e_shell_set_line_status		(EShell *shell,
                                                  EShellLineStatus status);
 GtkWidget *	e_shell_get_preferences_window	(void);
 void		e_shell_event			(EShell *shell,
-						 const gchar *event_name);
+						 const gchar *event_name,
+						 gpointer event_data);
 gboolean	e_shell_is_busy			(EShell *shell);
 gboolean	e_shell_do_quit			(EShell *shell);
 gboolean	e_shell_quit			(EShell *shell);