Re: [PATCH] Support Copy/Paste/Reset on target terminal

[Dodji Seketeli <dodji seketeli org>]

Fabien Parent <parent f gmail com> a écrit:

> Sorry for the spam but I forgot to edit the patch title. I attached to
> this e-mail a new one.

No problem.  I appreciate this kind of spam that compiles, executes, and
brings new features.  :-)

> 
> 	* src/persp/dbgperspective/menus/Makefile.am: Add terminal menu file
> 	* src/persp/dbgperspective/menus/terminalmenu.xml: New file
> 	* src/persp/dbgperspective/nmv-dbg-perspective.cc
> 	(DBGPerspective::get_terminal): pass the ui manager to the terminal
> 	* src/uicommon/nmv-terminal.cc
> 	(on_button_press_signal): New API
> 	(Terminal::Priv::Priv): Move code into a new method init_body, and call it
> 	along with init_actions.
> 	(Terminal::Priv::init_body): Code moved from Terminal::Priv::Priv.
> 	(Terminal::Priv::init_actions): New API
> 	(Terminal::Priv::on_reset_signal): Likewise
> 	(Terminal::Priv::on_copy_signal): Likewise
> 	(Terminal::Priv::on_paste_signal): Likewise
> 	(Terminal::Priv::reset): Likewise
> 	(Terminal::Priv::copy): Likewise
> 	(Terminal::Priv::paste): Likewise
> 	(Terminal::Terminal): Add a new paramater
> 	* src/uicommon/nmv-terminal.h
> 	(Terminal::Terminal): Set constructor explicit and add a new parameter.


[...]


> diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
> index 5304563..cf0b188 100644
> --- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
> +++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
> @@ -8372,7 +8372,13 @@ DBGPerspective::get_terminal ()
>  {
>      THROW_IF_FAIL (m_priv);
>      if (!m_priv->terminal) {
> -        m_priv->terminal.reset (new Terminal);
> +        string relative_path = Glib::build_filename ("menus",
> +                                                     "terminalmenu.xml");
> +        string absolute_path;
> +        THROW_IF_FAIL (build_absolute_resource_path
> +                (Glib::filename_to_utf8 (relative_path), absolute_path));
> +
> +        m_priv->terminal.reset (new Terminal (absolute_path, workbench ().get_ui_manager ()));

This line is longer than 80 characters, please split it.

This patch is OK to commit on gtk2-branch and master with the above
change.  Please note that the patch doesn't apply cleanly to gtk2-branch
so some minor adjustments are required.  Also, please post the final
adjusted patch on the mailing list once you have committed it to that
gtk2-branch.

Thanks.

-- 
		Dodji