[vte] widget: Move some methods to VteTerminalPrivate
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] widget: Move some methods to VteTerminalPrivate
- Date: Sat, 5 Dec 2015 21:06:54 +0000 (UTC)
commit 9f45ee1539d2a68a6c6e09146b3561105af61556
Author: Christian Persch <chpe gnome org>
Date: Mon Nov 30 17:23:34 2015 +0100
widget: Move some methods to VteTerminalPrivate
src/vte.cc | 14 +++++++-------
src/vteinternal.hh | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 2e04324..9846373 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -3633,17 +3633,17 @@ VteTerminalPrivate::spawn_sync(VtePtyFlags pty_flags,
}
/* Handle an EOF from the client. */
-static void
-vte_terminal_eof(GIOChannel *channel, VteTerminal *terminal)
+void
+VteTerminalPrivate::pty_channel_eof()
{
- GObject *object = G_OBJECT(terminal);
+ GObject *object = G_OBJECT(m_terminal);
g_object_freeze_notify(object);
- vte_terminal_set_pty(terminal, NULL);
+ set_pty(nullptr);
/* Emit a signal that we read an EOF. */
- terminal->pvt->queue_eof();
+ queue_eof();
g_object_thaw_notify(object);
}
@@ -4254,13 +4254,13 @@ out:
gdk_threads_enter ();
G_GNUC_END_IGNORE_DEPRECATIONS;
- vte_terminal_eof (channel, terminal);
+ terminal->pvt->pty_channel_eof();
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gdk_threads_leave ();
G_GNUC_END_IGNORE_DEPRECATIONS;
} else {
- vte_terminal_eof (channel, terminal);
+ terminal->pvt->pty_channel_eof();
}
again = FALSE;
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 6b95b48..601a6c8 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -536,6 +536,8 @@ public:
void pty_termios_changed();
void pty_scroll_lock_changed(bool locked);
+ void pty_channel_eof();
+
void watch_child (GPid child_pid);
void child_watch_done(GPid pid,
int status);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]