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
This commit is contained in:
@ -43,7 +43,7 @@
|
||||
|
||||
#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
|
||||
|
||||
static GtkObjectClass *parent_class = NULL;
|
||||
static BonoboXObjectClass *parent_class = NULL;
|
||||
|
||||
struct _UserCreatableItemType {
|
||||
char *id;
|
||||
@ -724,7 +724,7 @@ destroy (GtkObject *object)
|
||||
|
||||
g_free (priv);
|
||||
|
||||
parent_class->destroy (object);
|
||||
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user