Change type of parent_class to BonoboXObjectClass.

* evolution-shell-component.c: Change type of parent_class to
BonoboXObjectClass.

* e-shell.c (pop_up_activation_error_dialog): New helper function
to pop up a dialog if one of the components couldn't be activated,
getting the description for the error from
e_get_activation_failure_msg().
(setup_components): Use this function in case of activation error.
(set_owner_on_components): Likewise, when the component gets
restarted.  Also get a @splash arg so we can set the parent for
this dialog correctly.

* e-component-registry.c (register_component): New arg @ev.
(e_component_registry_register_component): Likewise.
(e_component_registry_restart_component): Likewise.  Also, remove
some bogus code that was #if'ed out.

* evolution-shell-component-client.c
(evolution_shell_component_client_new): New arg @ev.

* evolution-shell-component-utils.c
(e_get_activation_failure_msg): New.

svn path=/trunk/; revision=16342

1 files changed, 5 insertions, 2 deletions

diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h
index 4d2eb9e7d6..5aceab64c7 100644
--- a/shell/evolution-shell-component-utils.h
+++ b/shell/evolution-shell-component-utils.h
@@ -41,8 +41,11 @@ typedef struct _EPixmap {
 /* Takes an array of pixmaps, terminated by E_PIXMAP_END, and loads into uic */
 void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache);
 
-void e_activation_failure_dialog (GtkWindow *parent, const char *msg,
-				  const char *oafiid, const char *repo_id);
+void  e_activation_failure_dialog   (GtkWindow       *parent,
+				     const char      *msg,
+				     const char      *oafiid,
+				     const char      *repo_id);
+char *e_get_activation_failure_msg  (CORBA_Environment *ev);
 
 #ifdef __cplusplus
 }