add a "new_view_xid" arg, so the component has a window id to make use of
* Evolution-ShellComponent.idl (interactive): add a "new_view_xid" arg, so the component has a window id to make use of as a parent if it needs to pop up a dialog. * e-shell.c (set_interactive): Pass the new_view_xid when going interactive. (e_shell_set_interactive): Remove this since it wasn't being used, and couldn't be used for anything except lying to the components. * evolution-shell-component.c (evolution_shell_component_class_init): Update "interactive" signal definition (impl_interactive): Update prototype and signal emission * e-shell-marshal.list (NONE:BOOL,INT): add svn path=/trunk/; revision=20493
This commit is contained in:
@ -492,6 +492,7 @@ impl_debug (PortableServer_Servant servant,
|
||||
static void
|
||||
impl_interactive (PortableServer_Servant servant,
|
||||
CORBA_boolean interactive,
|
||||
CORBA_unsigned_long new_view_xid,
|
||||
CORBA_Environment *ev)
|
||||
{
|
||||
BonoboObject *bonobo_object;
|
||||
@ -500,7 +501,8 @@ impl_interactive (PortableServer_Servant servant,
|
||||
bonobo_object = bonobo_object_from_servant (servant);
|
||||
shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
|
||||
|
||||
g_signal_emit (shell_component, signals[INTERACTIVE], 0, interactive);
|
||||
g_signal_emit (shell_component, signals[INTERACTIVE], 0,
|
||||
interactive, new_view_xid);
|
||||
}
|
||||
|
||||
static Bonobo_Control
|
||||
@ -921,9 +923,10 @@ evolution_shell_component_class_init (EvolutionShellComponentClass *klass)
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
G_STRUCT_OFFSET (EvolutionShellComponentClass, interactive),
|
||||
NULL, NULL,
|
||||
e_shell_marshal_NONE__BOOL,
|
||||
G_TYPE_NONE, 1,
|
||||
G_TYPE_BOOLEAN);
|
||||
e_shell_marshal_NONE__BOOL_INT,
|
||||
G_TYPE_NONE, 2,
|
||||
G_TYPE_BOOLEAN,
|
||||
G_TYPE_INT);
|
||||
|
||||
signals[HANDLE_EXTERNAL_URI]
|
||||
= g_signal_new ("handle_external_uri",
|
||||
|
||||
Reference in New Issue
Block a user